From d5f60e05ab51022dd9d8c58ac727c0488c1adea6 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 15 May 2024 13:05:11 +0100 Subject: [PATCH] Fix Linux build docker tag for release builds --- .github/workflows/build_linux.yaml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml index 150969e..7393087 100644 --- a/.github/workflows/build_linux.yaml +++ b/.github/workflows/build_linux.yaml @@ -28,7 +28,7 @@ jobs: hak: runs-on: ${{ inputs.arch == 'arm64' && 'dind-l-arm64' || 'ubuntu-latest' }} env: - HAK_DOCKER_IMAGE: ${{ format('ghcr.io/element-hq/element-desktop-dockerbuild:{0}', github.event_name == 'pull_request' && 'develop' || github.ref_name) }} + HAK_DOCKER_IMAGE: ghcr.io/element-hq/element-desktop-dockerbuild outputs: cache-key: ${{ steps.cache-key.outputs.key }} arch: ${{ steps.config.outputs.arch }} @@ -45,6 +45,16 @@ jobs: chmod +x $HOME/bin/yarn echo "$HOME/bin" >> $GITHUB_PATH + - name: Resolve docker image tag for push + if: github.event_name == 'push' + run: echo "HAK_DOCKER_IMAGE=$HAK_DOCKER_IMAGE:$GITHUB_REF_NAME" >> $GITHUB_ENV + - name: Resolve docker image tag for release + if: github.event_name == 'release' + run: echo "HAK_DOCKER_IMAGE=$HAK_DOCKER_IMAGE:staging" >> $GITHUB_ENV + - name: Resolve docker image tag for other triggers + if: github.event_name != 'push' && github.event_name != 'release' + run: echo "HAK_DOCKER_IMAGE=$HAK_DOCKER_IMAGE:develop" >> $GITHUB_ENV + - uses: nbucic/variable-mapper@0673f6891a0619ba7c002ecfed0f9f4f39017b6f id: config with: