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>
This commit is contained in:
Chris Evich
2021-01-28 11:47:05 -05:00
parent fb653c43ed
commit 8d979e093e
3 changed files with 4 additions and 1 deletions

View File

@ -342,7 +342,7 @@ static_alt_build_task:
- build - build
# Community-maintained task, may fail on occasion. If so, uncomment # Community-maintained task, may fail on occasion. If so, uncomment
# the next line and file an issue with details about the failure. # the next line and file an issue with details about the failure.
allow_failures: $CI == $CI # allow_failures: $CI == $CI
gce_instance: *bigvm gce_instance: *bigvm
env: env:
<<: *stdenvars <<: *stdenvars

View File

@ -39,6 +39,7 @@ filtered_changes=$(git diff --name-status $base $head |
egrep -v '^contrib/' | egrep -v '^contrib/' |
egrep -v '^docs/' | egrep -v '^docs/' |
egrep -v '^hack/' | egrep -v '^hack/' |
egrep -v '^nix/' |
egrep -v '^vendor/' | egrep -v '^vendor/' |
egrep -v '^version/') egrep -v '^version/')
if [[ -z "$filtered_changes" ]]; then if [[ -z "$filtered_changes" ]]; then

View File

@ -49,9 +49,11 @@ let
buildPhase = '' buildPhase = ''
patchShebangs . patchShebangs .
make bin/podman make bin/podman
make bin/podman-remote
''; '';
installPhase = '' installPhase = ''
install -Dm755 bin/podman $out/bin/podman install -Dm755 bin/podman $out/bin/podman
install -Dm755 bin/podman-remote $out/bin/podman-remote
''; '';
}; };
in self in self