From fe365a0ced9066bf4923797cca8394ceebb13b24 Mon Sep 17 00:00:00 2001 From: Dan Rosser Date: Mon, 16 Nov 2026 07:41:58 +1100 Subject: [PATCH] release-libs: match a stable 'Resolved apothecary release' line The yaml download-libs step still greps for the old 'pinned by scripts/dev/apothecary_release: ' line, but after #8681 download_libs.sh now prints either 'override from ...' or 'derived from HEAD's tag ...' depending on which path resolved the release, so the grep fails and the 0.12.2-RC1 release-libs run's download jobs report failure even though the right libraries install. Emit a single stable 'Resolved apothecary release: ' line after either path, and match that line in release-libs.yml. --- .github/workflows/release-libs.yml | 4 ++-- scripts/dev/download_libs.sh | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-libs.yml b/.github/workflows/release-libs.yml index 6f1dbb509bf..5814271ae4f 100644 --- a/.github/workflows/release-libs.yml +++ b/.github/workflows/release-libs.yml @@ -145,9 +145,9 @@ jobs: shell: bash run: | set -o pipefail - # no -t: this tests the pin a user's checkout of the tag gets + # no -t: this tests the apothecary release a user's checkout of the tag gets scripts/${{ matrix.platform }}/download_libs.sh 2>&1 | tee download.log - grep -q "pinned by scripts/dev/apothecary_release: ${{ needs.apothecary-release.outputs.apothecary_tag }}" download.log + grep -q "Resolved apothecary release: ${{ needs.apothecary-release.outputs.apothecary_tag }}" download.log grep -qE "secure \(SHA-256 verified" download.log || echo "::warning::download_libs.sh didn't report SHA-256 verified packages" verdict: diff --git a/scripts/dev/download_libs.sh b/scripts/dev/download_libs.sh index 983151bbf93..83604e04e63 100755 --- a/scripts/dev/download_libs.sh +++ b/scripts/dev/download_libs.sh @@ -654,6 +654,10 @@ if [[ $USE_PIN == 1 ]]; then elif [[ $USE_GIT_TAG == 1 ]]; then echo " Using the apothecary release derived from HEAD's tag $GIT_TAG: $TAG" fi +# Stable one-liner for release-libs.yml's grep, independent of which path resolved it. +if [[ $USE_PIN == 1 ]] || [[ $USE_GIT_TAG == 1 ]]; then + echo " Resolved apothecary release: $TAG" +fi if [[ $BLEEDING_EDGE = 1 ]] ; then VER=latest