summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2021-01-18 11:23:04 -0700
committerEd Santiago <santiago@redhat.com>2021-01-18 15:10:58 -0700
commitd2ee3d8151d28ae947d586cb514dc195e32166b3 (patch)
tree5ffa1a2e3736af9558af309f626b049c0bcad3f7
parent5f1a7a7d27824a0708760ae8f964b19caef18f3d (diff)
downloadpodman-d2ee3d8151d28ae947d586cb514dc195e32166b3.tar.gz
podman-d2ee3d8151d28ae947d586cb514dc195e32166b3.tar.bz2
podman-d2ee3d8151d28ae947d586cb514dc195e32166b3.zip
runner.sh : deal with bash 'set -e'
Release trigger script failed[1] because the entire script runs under 'set -e'; so a 'grep -- -dev' that finds no results will cause a nonzero exit status and hence the entire script to fail. Work around that. [1] https://cirrus-ci.com/task/4541290882793472 Signed-off-by: Ed Santiago <santiago@redhat.com>
-rwxr-xr-xcontrib/cirrus/runner.sh3
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