Skip to content

Commit 5ddeaec

Browse files
rtibblesbotclaude
andcommitted
Invoke publish.sh via bash in its round-trip test
publish.sh is a bash script (set -o pipefail), but the test invoked it via `sh`, which aborts under a dash that lacks pipefail — as on the CI runner, though not the newer dash in the test container. The publish workflow already runs it via bash; match that. Same bug class as the seed-test fix. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent 188565e commit 5ddeaec

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

platforms/apt-repo/tests/test_publish_roundtrip.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ mkdir -p "$BUCKET"
6464
export KOLIBRI_APT_BUCKET="$BUCKET"
6565

6666
# --- two sequential publishes -----------------------------------------------
67-
sh "$PUBLISH" "$WORK/aaa-test_1.0_all.deb"
68-
sh "$PUBLISH" "$WORK/bbb-test_1.0_all.deb"
67+
bash "$PUBLISH" "$WORK/aaa-test_1.0_all.deb"
68+
bash "$PUBLISH" "$WORK/bbb-test_1.0_all.deb"
6969

7070
# --- AC#3: both present after the second publish ----------------------------
7171
PKGS="$BUCKET/dists/stable/main/binary-amd64/Packages"
@@ -79,7 +79,7 @@ grep -q "^Package: bbb-test$" "$PKGS" || { echo "FAIL: bbb-test missing after se
7979
[ -f "$BUCKET/pubkey.asc" ] || { echo "FAIL: pubkey.asc not served at bucket root"; exit 1; }
8080

8181
# --- bootstrap-root path: kolibri-archive-keyring.deb at bucket root ---------
82-
KOLIBRI_KEYRING_DEB="$WORK/aaa-test_1.0_all.deb" sh "$PUBLISH" "$WORK/aaa-test_1.0_all.deb"
82+
KOLIBRI_KEYRING_DEB="$WORK/aaa-test_1.0_all.deb" bash "$PUBLISH" "$WORK/aaa-test_1.0_all.deb"
8383
[ -f "$BUCKET/kolibri-archive-keyring.deb" ] \
8484
|| { echo "FAIL: kolibri-archive-keyring.deb not served at bucket root"; exit 1; }
8585

@@ -105,8 +105,8 @@ EOF
105105
}
106106
build_keyring_variant a
107107
build_keyring_variant b
108-
KOLIBRI_KEYRING_DEB="$WORK/kr-keyring-a.deb" sh "$PUBLISH" "$WORK/aaa-test_1.0_all.deb"
109-
KOLIBRI_KEYRING_DEB="$WORK/kr-keyring-b.deb" sh "$PUBLISH" "$WORK/aaa-test_1.0_all.deb" \
108+
KOLIBRI_KEYRING_DEB="$WORK/kr-keyring-a.deb" bash "$PUBLISH" "$WORK/aaa-test_1.0_all.deb"
109+
KOLIBRI_KEYRING_DEB="$WORK/kr-keyring-b.deb" bash "$PUBLISH" "$WORK/aaa-test_1.0_all.deb" \
110110
|| { echo "FAIL: keyring re-publish aborted on a rebuilt same-version .deb"; exit 1; }
111111

112112
echo "PASS: round-trip preserves prior packages; Release signed; pubkey.asc + bootstrap deb served"

0 commit comments

Comments
 (0)