diff options
| author | Chris Evich <cevich@redhat.com> | 2021-01-28 11:47:05 -0500 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2021-01-28 13:58:11 -0500 |
| commit | 8d979e093e8a5d79f192f123dbcfc2c973d3bb21 (patch) | |
| tree | 58f46130fe646e70f6760db270b10ff5c1bd0712 | |
| parent | fb653c43ed1eb9eb9b97ca80edb8df6caab88905 (diff) | |
| download | podman-8d979e093e8a5d79f192f123dbcfc2c973d3bb21.tar.gz podman-8d979e093e8a5d79f192f123dbcfc2c973d3bb21.tar.bz2 podman-8d979e093e8a5d79f192f123dbcfc2c973d3bb21.zip | |
Cirrus: Build static podman-remote
Prior to this commit, the "Static Build" task only produced a
`bin/podman`. Update this to also include a `bin/podman-remote`
binary.
Update the pr-should-include-tests checker to ignore the `nix`
directory, which isn't applicable.
Lastly, restore the static build task to 'required' for CI success.
Leaving the comment inplace in case it needs to be bypassed in the
future on short notice.
Signed-off-by: Chris Evich <cevich@redhat.com>
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rwxr-xr-x | contrib/cirrus/pr-should-include-tests | 1 | ||||
| -rw-r--r-- | nix/default.nix | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 5b0d9ee6c..af6c64058 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -342,7 +342,7 @@ static_alt_build_task: - build # Community-maintained task, may fail on occasion. If so, uncomment # the next line and file an issue with details about the failure. - allow_failures: $CI == $CI + # allow_failures: $CI == $CI gce_instance: *bigvm env: <<: *stdenvars diff --git a/contrib/cirrus/pr-should-include-tests b/contrib/cirrus/pr-should-include-tests index caf27cf83..a3b4847a7 100755 --- a/contrib/cirrus/pr-should-include-tests +++ b/contrib/cirrus/pr-should-include-tests @@ -39,6 +39,7 @@ filtered_changes=$(git diff --name-status $base $head | egrep -v '^contrib/' | egrep -v '^docs/' | egrep -v '^hack/' | + egrep -v '^nix/' | egrep -v '^vendor/' | egrep -v '^version/') if [[ -z "$filtered_changes" ]]; then diff --git a/nix/default.nix b/nix/default.nix index 13b4585ea..7745d8b50 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -49,9 +49,11 @@ let buildPhase = '' patchShebangs . make bin/podman + make bin/podman-remote ''; installPhase = '' install -Dm755 bin/podman $out/bin/podman + install -Dm755 bin/podman-remote $out/bin/podman-remote ''; }; in self |