Skip to content

Commit cb0bf52

Browse files
committed
btrfs-progs: ci: fix parameter parsing in image running scripts
There's an unconditional 'shift' in the scripts that will lead to an error "cannot shift" and this would fail inside CI. We want an implicit run on current HEAD so shift only when there are more parameters. Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 9d3217b commit cb0bf52

File tree

6 files changed

+18
-6
lines changed

6 files changed

+18
-6
lines changed

ci/ci-build-centos7

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ fi
1616

1717
CIIMAGEDIR=ci/images/ci-centos-7-x86_64
1818
BRANCH=${1:-HEAD}
19-
shift
19+
if [ "$#" -ge 1 ]; then
20+
shift
21+
fi
2022
HASH=$(git log -1 --format='%h %s' "$BRANCH")
2123

2224
echo "CI: Generate archive from $BRANCH ($HASH)"

ci/ci-build-centos8

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ fi
1616

1717
CIIMAGEDIR=ci/images/ci-centos-8-x86_64
1818
BRANCH=${1:-HEAD}
19-
shift
19+
if [ "$#" -ge 1 ]; then
20+
shift
21+
fi
2022
HASH=$(git log -1 --format='%h %s' "$BRANCH")
2123

2224
echo "CI: Generate archive from $BRANCH ($HASH)"

ci/ci-build-leap153

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ fi
1616

1717
CIIMAGEDIR=ci/images/ci-openSUSE-Leap-15.3-x86_64
1818
BRANCH=${1:-HEAD}
19-
shift
19+
if [ "$#" -ge 1 ]; then
20+
shift
21+
fi
2022
HASH=$(git log -1 --format='%h %s' "$BRANCH")
2123

2224
echo "CI: Generate archive from $BRANCH ($HASH)"

ci/ci-build-leap154

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ fi
1616

1717
CIIMAGEDIR=ci/images/ci-openSUSE-Leap-15.4-x86_64
1818
BRANCH=${1:-HEAD}
19-
shift
19+
if [ "$#" -ge 1 ]; then
20+
shift
21+
fi
2022
HASH=$(git log -1 --format='%h %s' "$BRANCH")
2123

2224
echo "CI: Generate archive from $BRANCH ($HASH)"

ci/ci-build-musl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ fi
1616

1717
CIIMAGEDIR=ci/images/ci-musl-x86_64
1818
BRANCH=${1:-HEAD}
19-
shift
19+
if [ "$#" -ge 1 ]; then
20+
shift
21+
fi
2022
HASH=$(git log -1 --format='%h %s' "$BRANCH")
2123

2224
echo "CI: Generate archive from $BRANCH ($HASH)"

ci/ci-build-tumbleweed

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ fi
1616

1717
CIIMAGEDIR=ci/images/ci-openSUSE-tumbleweed-x86_64
1818
BRANCH=${1:-HEAD}
19-
shift
19+
if [ "$#" -ge 1 ]; then
20+
shift
21+
fi
2022
HASH=$(git log -1 --format='%h %s' "$BRANCH")
2123

2224
echo "CI: Generate archive from $BRANCH ($HASH)"

0 commit comments

Comments
 (0)