From 68351efbbe8141e574a4e1393883c0530f3dae87 Mon Sep 17 00:00:00 2001 From: Scott Andrews Date: Sun, 24 May 2026 22:15:00 -0400 Subject: [PATCH] fix 'v' version prefix (redux) Signed-off-by: Scott Andrews --- .github/workflows/push.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index f91ec1b..01dc210 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -39,32 +39,32 @@ jobs: echo "rust-version=$(yq -r '.toolchain.channel' rust-toolchain.toml)" | tee -a "${GITHUB_OUTPUT}" # stable - wasmtime_stable_version="v$(cd versions/stable ; yq -p toml -oj -r '.package[] | select(.name == "wasmtime-cli") | .version' Cargo.lock)" - wasmtime_stable_git_sha="$(gh api "repos/bytecodealliance/wasmtime/commits/refs/tags/${wasmtime_stable_version}" --template '{{.sha}}'))" + wasmtime_stable_version="$(cd versions/stable ; yq -p toml -oj -r '.package[] | select(.name == "wasmtime-cli") | .version' Cargo.lock)" + wasmtime_stable_git_sha="$(gh api "repos/bytecodealliance/wasmtime/commits/refs/tags/v${wasmtime_stable_version}" --template '{{.sha}}'))" echo "wasmtime-stable-version=${wasmtime_stable_version}" | tee -a "${GITHUB_OUTPUT}" echo "wasmtime-stable-version-major=$(echo "${wasmtime_stable_version}" | cut -d. -f1)" | tee -a "${GITHUB_OUTPUT}" echo "wasmtime-stable-version-minor=$(echo "${wasmtime_stable_version}" | cut -d. -f1-2)" | tee -a "${GITHUB_OUTPUT}" echo "wasmtime-stable-git-sha=${wasmtime_stable_git_sha}" | tee -a "${GITHUB_OUTPUT}" # stable, minus 1 - wasmtime_stable_1_version="v$(cd versions/stable-1 ; yq -p toml -oj -r '.package[] | select(.name == "wasmtime-cli") | .version' Cargo.lock)" - wasmtime_stable_1_git_sha="$(gh api "repos/bytecodealliance/wasmtime/commits/refs/tags/${wasmtime_stable_1_version}" --template '{{.sha}}'))" + wasmtime_stable_1_version="$(cd versions/stable-1 ; yq -p toml -oj -r '.package[] | select(.name == "wasmtime-cli") | .version' Cargo.lock)" + wasmtime_stable_1_git_sha="$(gh api "repos/bytecodealliance/wasmtime/commits/refs/tags/v${wasmtime_stable_1_version}" --template '{{.sha}}'))" echo "wasmtime-stable-1-version=${wasmtime_stable_1_version}" | tee -a "${GITHUB_OUTPUT}" echo "wasmtime-stable-1-version-major=$(echo "${wasmtime_stable_1_version}" | cut -d. -f1)" | tee -a "${GITHUB_OUTPUT}" echo "wasmtime-stable-1-version-minor=$(echo "${wasmtime_stable_1_version}" | cut -d. -f1-2)" | tee -a "${GITHUB_OUTPUT}" echo "wasmtime-stable-1-git-sha=${wasmtime_stable_1_git_sha}" | tee -a "${GITHUB_OUTPUT}" # lts - wasmtime_lts_version="v$(cd versions/lts ; yq -p toml -oj -r '.package[] | select(.name == "wasmtime-cli") | .version' Cargo.lock)" - wasmtime_lts_git_sha="$(gh api "repos/bytecodealliance/wasmtime/commits/refs/tags/${wasmtime_lts_version}" --template '{{.sha}}'))" + wasmtime_lts_version="$(cd versions/lts ; yq -p toml -oj -r '.package[] | select(.name == "wasmtime-cli") | .version' Cargo.lock)" + wasmtime_lts_git_sha="$(gh api "repos/bytecodealliance/wasmtime/commits/refs/tags/v${wasmtime_lts_version}" --template '{{.sha}}'))" echo "wasmtime-lts-version=${wasmtime_lts_version}" | tee -a "${GITHUB_OUTPUT}" echo "wasmtime-lts-version-major=$(echo "${wasmtime_lts_version}" | cut -d. -f1)" | tee -a "${GITHUB_OUTPUT}" echo "wasmtime-lts-version-minor=$(echo "${wasmtime_lts_version}" | cut -d. -f1-2)" | tee -a "${GITHUB_OUTPUT}" echo "wasmtime-lts-git-sha=${wasmtime_lts_git_sha}" | tee -a "${GITHUB_OUTPUT}" # lts, minus 1 - wasmtime_lts_1_version="v$(cd versions/lts-1 ; yq -p toml -oj -r '.package[] | select(.name == "wasmtime-cli") | .version' Cargo.lock)" - wasmtime_lts_1_git_sha="$(gh api "repos/bytecodealliance/wasmtime/commits/refs/tags/${wasmtime_lts_1_version}" --template '{{.sha}}'))" + wasmtime_lts_1_version="$(cd versions/lts-1 ; yq -p toml -oj -r '.package[] | select(.name == "wasmtime-cli") | .version' Cargo.lock)" + wasmtime_lts_1_git_sha="$(gh api "repos/bytecodealliance/wasmtime/commits/refs/tags/v${wasmtime_lts_1_version}" --template '{{.sha}}'))" echo "wasmtime-lts-1-version=${wasmtime_lts_1_version}" | tee -a "${GITHUB_OUTPUT}" echo "wasmtime-lts-1-version-major=$(echo "${wasmtime_lts_1_version}" | cut -d. -f1)" | tee -a "${GITHUB_OUTPUT}" echo "wasmtime-lts-1-version-minor=$(echo "${wasmtime_lts_1_version}" | cut -d. -f1-2)" | tee -a "${GITHUB_OUTPUT}" @@ -83,7 +83,7 @@ jobs: include: - wasmtime-crate: ${{ needs.preflight.outputs.wasmtime-stable-version }} wasmtime-git-sha: ${{ needs.preflight.outputs.wasmtime-stable-git-sha }} - tag: ${{ needs.preflight.outputs.wasmtime-stable-version }} + tag: v${{ needs.preflight.outputs.wasmtime-stable-version }} additional-tags: | ${{ needs.preflight.outputs.wasmtime-stable-version-minor }} ${{ needs.preflight.outputs.wasmtime-stable-version-major }} @@ -91,7 +91,7 @@ jobs: latest - wasmtime-crate: ${{ needs.preflight.outputs.wasmtime-stable-1-version }} wasmtime-git-sha: ${{ needs.preflight.outputs.wasmtime-stable-1-git-sha }} - tag: ${{ needs.preflight.outputs.wasmtime-stable-1-version }} + tag: v${{ needs.preflight.outputs.wasmtime-stable-1-version }} additional-tags: | ${{ needs.preflight.outputs.wasmtime-stable-1-version-minor }} ${{ needs.preflight.outputs.wasmtime-stable-1-version-major }} @@ -99,14 +99,14 @@ jobs: latest-1 - wasmtime-crate: ${{ needs.preflight.outputs.wasmtime-lts-version }} wasmtime-git-sha: ${{ needs.preflight.outputs.wasmtime-lts-git-sha }} - tag: ${{ needs.preflight.outputs.wasmtime-lts-version }} + tag: v${{ needs.preflight.outputs.wasmtime-lts-version }} additional-tags: | ${{ needs.preflight.outputs.wasmtime-lts-version-major }} ${{ needs.preflight.outputs.wasmtime-lts-version-minor }} lts - wasmtime-crate: ${{ needs.preflight.outputs.wasmtime-lts-1-version }} wasmtime-git-sha: ${{ needs.preflight.outputs.wasmtime-lts-1-git-sha }} - tag: ${{ needs.preflight.outputs.wasmtime-lts-1-version }} + tag: v${{ needs.preflight.outputs.wasmtime-lts-1-version }} additional-tags: | ${{ needs.preflight.outputs.wasmtime-lts-1-version-minor }} ${{ needs.preflight.outputs.wasmtime-lts-1-version-major }}