diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-27 21:54:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-27 21:54:04 +0100 |
| commit | 404252806730ffc2d08e16af3948e33baf924b3f (patch) | |
| tree | efc5a39687c200771588bec1c69aa947af174f7d | |
| parent | f1f26f444228381224581609a327f13158740923 (diff) | |
| parent | bd9a18df15106d18abb1d9faf3aa8a1a108351f7 (diff) | |
| download | podman-404252806730ffc2d08e16af3948e33baf924b3f.tar.gz podman-404252806730ffc2d08e16af3948e33baf924b3f.tar.bz2 podman-404252806730ffc2d08e16af3948e33baf924b3f.zip | |
Merge pull request #2464 from mheon/build_test_no_varlink
Add a task to Cirrus gating to build w/o Varlink
| -rw-r--r-- | .cirrus.yml | 5 | ||||
| -rw-r--r-- | contrib/gate/Dockerfile | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index ad9edd404..4521866d1 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -118,6 +118,11 @@ gating_task: - '/usr/local/bin/entrypoint.sh vendor' - 'cd /go/src/github.com/containers/libpod && ./hack/tree_status.sh' + # This task builds Podman with different buildtags to ensure the build does + # not break. + build_script: + - '/usr/local/bin/entrypoint.sh clean podman BUILDTAGS="exclude_graphdriver_devicemapper selinux seccomp"' + build_each_commit_task: diff --git a/contrib/gate/Dockerfile b/contrib/gate/Dockerfile index f9b57a6da..4d88ae9a6 100644 --- a/contrib/gate/Dockerfile +++ b/contrib/gate/Dockerfile @@ -49,8 +49,6 @@ WORKDIR $GOSRC # Install dependencies RUN set -x && \ - go get -u github.com/mailru/easyjson/... && \ - install -D -m 755 "$GOPATH"/bin/easyjson /usr/bin/ && \ make install.tools && \ install -D -m 755 $GOSRC/contrib/gate/entrypoint.sh /usr/local/bin/ && \ rm -rf "$GOSRC" |