From f1283dcf02080efd8aae5c230034a25fb10a7994 Mon Sep 17 00:00:00 2001 From: John Carlson Date: Wed, 17 Jun 2026 23:56:53 -0500 Subject: [PATCH] release: denote the AOSP source ref in release title + notes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The release name is the build-tools version (platform-tools-X.Y.Z), but since AOSP's android-NN.0.0_rN scheme the source actually built from diverges from it — platform-tools-37.0.0 is built from android-17.0.0_r1. The notes hardcoded "Built from upstream AOSP tag $TAG", which printed the release name rather than the source. Use the detect job's source_ref instead, and append it to the title when the two differ (legacy releases where source_ref == tag are unchanged). Co-Authored-By: Claude Opus 4.8 --- .github/workflows/upstream-watch.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/upstream-watch.yml b/.github/workflows/upstream-watch.yml index 3ac1204..4483d37 100644 --- a/.github/workflows/upstream-watch.yml +++ b/.github/workflows/upstream-watch.yml @@ -194,6 +194,7 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} TAG: ${{ needs.detect.outputs.tag }} + SOURCE_REF: ${{ needs.detect.outputs.source_ref }} run: | set -euo pipefail # Compute checksums for the discrete binaries. @@ -206,7 +207,7 @@ jobs: targeting **linux-glibc-arm64** (Raspberry Pi, Asahi Linux, Ampere servers, native arm64 WSL, etc.). - Built from upstream AOSP tag \`$TAG\`. + Built from upstream AOSP source tag \`$SOURCE_REF\`. ## Drop into your Android SDK @@ -227,9 +228,18 @@ jobs: EOF ) + # The release name is the build-tools version + # (platform-tools-X.Y.Z); the AOSP ref it's actually built from + # can differ (e.g. android-17.0.0_r1). Surface the source ref in + # the title too when the two diverge. + TITLE="$TAG (linux-arm64)" + if [ "$SOURCE_REF" != "$TAG" ]; then + TITLE="$TITLE · $SOURCE_REF" + fi + gh release create "$TAG" \ --repo "$GITHUB_REPOSITORY" \ - --title "$TAG (linux-arm64)" \ + --title "$TITLE" \ --notes "$NOTES" \ out/dist/*.tar.xz \ out/linux-arm64/aapt2 \