diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-19 01:50:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 01:50:26 -0500 |
| commit | ade8a92d169328fb01c01344e6d6972d744cc696 (patch) | |
| tree | c4f20dce5f745614c2486feb81cdf2a1d1cabefa | |
| parent | c176510de6b2ee00bf271807671d113afee6b806 (diff) | |
| parent | 46df46ab6034b7efdb94492584308e7cd42b6077 (diff) | |
| download | podman-ade8a92d169328fb01c01344e6d6972d744cc696.tar.gz podman-ade8a92d169328fb01c01344e6d6972d744cc696.tar.bz2 podman-ade8a92d169328fb01c01344e6d6972d744cc696.zip | |
Merge pull request #9013 from edsantiago/release_deal_with_set_minus_e--3.0
[v3.0] 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 |