From af0ddcb48ce3df4e7d1e52200f5f3133d0d6fc97 Mon Sep 17 00:00:00 2001 From: Sam Catlow Date: Wed, 23 Sep 2026 03:51:36 +1000 Subject: [PATCH] fix(release): teach the image job the one-stream tag The one-stream change updated the changelog gate, release.sh and the docs, but missed the image job. Measured on the v1.37.1 run: `gate` resolved 1.37.1 from the `v*` tag and then warned "No release tags at HEAD", while `build-and-push` read only `archied/v*`/`archie/v*`, found neither, and fell back to `dev+` for both components. It also skipped the archie-agent image entirely, because that step was gated on an `archie/v*` tag being present -- so a one-stream release would have published a dev-stamped gateway and never rebuilt the runtime. Three changes: - version resolution falls back to the one-stream `v*` tag, so both components are stamped with the release version; - the runtime image builds on a `v*` release as well, since one version covers the release; a legacy gateway-only release still skips it, which is what release_tag exists to distinguish; - the "no release tags at HEAD" warning recognises `v*`, so a real release stops being told it is not one. --- .github/workflows/deploy.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3c4589bbe..7c9208bbf 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -139,7 +139,7 @@ jobs: echo "edit the generated notes, then: task release VERSION=" exit 1 fi - if ! git tag --points-at HEAD | grep -qE 'archie' ; then + if ! git tag --points-at HEAD | grep -qE '^(v[0-9]|archied/v|archie/v)' ; then echo "::warning ::No release tags at HEAD, so this build publishes :latest for a commit that is not a release. It is stamped dev+ and tagged sha- so it stays traceable and restorable, but it supersedes the previous release's :latest stamping until the next release is cut." fi @@ -176,8 +176,14 @@ jobs: run: | GATEWAY_TAG="$(git tag --points-at HEAD --list 'archied/v*' | sort -V | tail -1)" RUNTIME_TAG="$(git tag --points-at HEAD --list 'archie/v*' | sort -V | tail -1)" + # One release stream: a `v*` tag covers the whole release, so it names + # both components' versions. Legacy per-component tags still win where + # they exist, because history is not re-tagged. + RELEASE_TAG="$(git tag --points-at HEAD --list 'v*' | sort -V | tail -1)" GATEWAY_VERSION="${GATEWAY_TAG#archied/}" RUNTIME_VERSION="${RUNTIME_TAG#archie/}" + [ -n "$GATEWAY_VERSION" ] || GATEWAY_VERSION="${RELEASE_TAG#v}" + [ -n "$RUNTIME_VERSION" ] || RUNTIME_VERSION="${RELEASE_TAG#v}" # Not a bare `dev`. A literal dev tells an operator nothing about which # build they are running, and it is what made a release's stamping look # transient: the next commit to main republished :latest as `dev`. The @@ -186,10 +192,14 @@ jobs: # case is handled by the dereference above.) [ -n "$GATEWAY_VERSION" ] || GATEWAY_VERSION="dev+${GITHUB_SHA:0:12}" [ -n "$RUNTIME_VERSION" ] || RUNTIME_VERSION="dev+${GITHUB_SHA:0:12}" - # Keep the raw tag presence separate from the version fallback: - # gateway-only releases must not rebuild the runtime image as dev. + # Keep the raw tag presence separate from the version fallback: a + # LEGACY gateway-only release (archied/v* and no archie/v*) must not + # rebuild the runtime image as dev. A one-stream `v*` release is not + # gateway-only -- one version covers the runtime too -- so it does + # rebuild it, and release_tag is what tells the two apart. echo "gateway_tag=$GATEWAY_TAG" >> "$GITHUB_OUTPUT" echo "runtime_tag=$RUNTIME_TAG" >> "$GITHUB_OUTPUT" + echo "release_tag=$RELEASE_TAG" >> "$GITHUB_OUTPUT" echo "gateway=$GATEWAY_VERSION" >> "$GITHUB_OUTPUT" echo "runtime=$RUNTIME_VERSION" >> "$GITHUB_OUTPUT" @@ -209,7 +219,7 @@ jobs: cache-to: type=gha,mode=max,scope=archied - name: Build and push archie-agent - if: steps.versions.outputs.runtime_tag != '' + if: steps.versions.outputs.runtime_tag != '' || steps.versions.outputs.release_tag != '' uses: docker/build-push-action@v6 with: context: .