diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-19 11:34:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 11:34:14 -0500 |
| commit | d99e475dd71f21ac5155d4b4b4bfef5101e55a85 (patch) | |
| tree | c3b61e221b2446f2d43618e72bf32cc6a228b717 | |
| parent | 8c6df5e93e6941a7f50da651678751f7dfec900e (diff) | |
| parent | d2ee3d8151d28ae947d586cb514dc195e32166b3 (diff) | |
| download | podman-d99e475dd71f21ac5155d4b4b4bfef5101e55a85.tar.gz podman-d99e475dd71f21ac5155d4b4b4bfef5101e55a85.tar.bz2 podman-d99e475dd71f21ac5155d4b4b4bfef5101e55a85.zip | |
Merge pull request #9008 from edsantiago/release_deal_with_set_minus_e
runner.sh : deal with bash 'set -e'
| -rwxr-xr-x | contrib/cirrus/runner.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index b0060163e..572f0b44a 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -210,7 +210,8 @@ function _run_release() { bin/podman info msg "Checking podman release (or potential release) criteria." - dev=$(bin/podman info |& grep -- -dev) + # We're running under 'set -eo pipefail'; make sure this statement passes + dev=$(bin/podman info |& grep -- -dev || echo -n '') if [[ -n "$dev" ]]; then die "Releases must never contain '-dev' in output of 'podman info' ($dev)" fi |