From cf85316ac8201c697ac3af2bd9391d47ce496741 Mon Sep 17 00:00:00 2001 From: Michael Karlesky Date: Thu, 23 Jan 2025 16:14:32 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20Prerelease=20tag=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 1a5cc2f..d12710c 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -39,6 +39,7 @@ jobs: env: IMAGE_NAME: ${{ needs.image-details.outputs.base-name }} IMAGE_URL: ${{ needs.image-details.outputs.base-url }} + # Image variant name is drawn from final `--dir` entry in file generation command line IMAGE_DIR: build/standard steps: @@ -96,9 +97,9 @@ jobs: attestations: write id-token: write env: - # Image variant name is drawn from final `--dir` entry in file generation command line IMAGE_NAME: ${{ needs.image-details.outputs.base-name }}-plugins IMAGE_URL: ${{ needs.image-details.outputs.base-url }}-plugins + # Image variant name is drawn from final `--dir` entry in file generation command line IMAGE_DIR: build/plugins steps: @@ -154,9 +155,9 @@ jobs: attestations: write id-token: write env: - # Image variant name is drawn from final `--dir` entry in file generation command line IMAGE_NAME: ${{ needs.image-details.outputs.base-name }}-arm-none-eabi IMAGE_URL: ${{ needs.image-details.outputs.base-url }}-arm-none-eabi + # Image variant name is drawn from final `--dir` entry in file generation command line IMAGE_DIR: build/arm-none-eabi steps: @@ -212,9 +213,9 @@ jobs: attestations: write id-token: write env: - # Image variant name is drawn from final `--dir` entry in file generation command line IMAGE_NAME: ${{ needs.image-details.outputs.base-name }}-arm-none-eabi-plugins IMAGE_URL: ${{ needs.image-details.outputs.base-url }}-arm-none-eabi-plugins + # Image variant name is drawn from final `--dir` entry in file generation command line IMAGE_DIR: build/arm-none-eabi-plugins steps: @@ -268,10 +269,16 @@ jobs: contents: write steps: + # Capture the SHA string + - name: Git commit short SHA as environment variable + shell: bash + run: | + echo "SHA_SHORT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + - uses: ncipollo/release-action@v1 with: prerelease: true allowUpdates: true - tag: ${{ github.ref }} + tag: ${{ env.SHA_SHORT }} artifacts: "build/*/docker/Dockerfile,build/*/assets/shell/welcome"