fix build with varlink

also add a cirrus task for building binaries with varlink.
From: Chris Evich <cevich@redhat.com>

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
Lokesh Mandvekar 2020-09-22 16:24:23 -04:00
parent 961a3d03c8
commit 16763c3df0
2 changed files with 8 additions and 1 deletions

View File

@ -123,6 +123,7 @@ gating_task:
# N/B: need 'clean' so some committed files are re-generated. # N/B: need 'clean' so some committed files are re-generated.
- '/usr/local/bin/entrypoint.sh clean podman-remote |& ${TIMESTAMP}' - '/usr/local/bin/entrypoint.sh clean podman-remote |& ${TIMESTAMP}'
- '/usr/local/bin/entrypoint.sh clean podman xref_helpmsgs_manpages BUILDTAGS="exclude_graphdriver_devicemapper selinux seccomp" |& ${TIMESTAMP}' - '/usr/local/bin/entrypoint.sh clean podman xref_helpmsgs_manpages BUILDTAGS="exclude_graphdriver_devicemapper selinux seccomp" |& ${TIMESTAMP}'
- '/usr/local/bin/entrypoint.sh clean BUILDTAGS="varlink" binaries |& ${TIMESTAMP}'
- '/usr/local/bin/entrypoint.sh local-cross |& ${TIMESTAMP}' - '/usr/local/bin/entrypoint.sh local-cross |& ${TIMESTAMP}'
# Verify some aspects of ci/related scripts # Verify some aspects of ci/related scripts

View File

@ -7,6 +7,7 @@ import (
"fmt" "fmt"
"os" "os"
goruntime "runtime" goruntime "runtime"
"strconv"
"time" "time"
"github.com/containers/image/v5/pkg/sysregistriesv2" "github.com/containers/image/v5/pkg/sysregistriesv2"
@ -22,13 +23,18 @@ func (i *VarlinkAPI) GetVersion(call iopodman.VarlinkCall) error {
return err return err
} }
int64APIVersion, err := strconv.ParseInt(versionInfo.APIVersion, 10, 64)
if err != nil {
return err
}
return call.ReplyGetVersion( return call.ReplyGetVersion(
versionInfo.Version, versionInfo.Version,
versionInfo.GoVersion, versionInfo.GoVersion,
versionInfo.GitCommit, versionInfo.GitCommit,
time.Unix(versionInfo.Built, 0).Format(time.RFC3339), time.Unix(versionInfo.Built, 0).Format(time.RFC3339),
versionInfo.OsArch, versionInfo.OsArch,
versionInfo.APIVersion, int64APIVersion,
) )
} }