diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-29 11:51:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-29 11:51:19 -0500 |
| commit | b59848a2b92b1554c55f6bd33a105c0fef158b8a (patch) | |
| tree | 430b8ada9ef6c3f8275a2ef21400c440edb1271e | |
| parent | 755d9b33ec9c6f0169d18c76cdf0d530bbcad31a (diff) | |
| parent | 8d979e093e8a5d79f192f123dbcfc2c973d3bb21 (diff) | |
| download | podman-b59848a2b92b1554c55f6bd33a105c0fef158b8a.tar.gz podman-b59848a2b92b1554c55f6bd33a105c0fef158b8a.tar.bz2 podman-b59848a2b92b1554c55f6bd33a105c0fef158b8a.zip | |
Merge pull request #9143 from cevich/static_remote
Cirrus: Build static podman-remote
| -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 |