From f67b4f5650c6f1f8b5bf67f2760a7c51959b695f Mon Sep 17 00:00:00 2001 From: Florian Date: Mon, 11 Nov 2024 16:27:51 +0100 Subject: [PATCH] ci/cd - fix missing 1.5-dev references --- .github/workflows/container-build.yml | 6 +++--- .github/workflows/linux-build.yml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/container-build.yml b/.github/workflows/container-build.yml index dc72636997..2513b014d8 100644 --- a/.github/workflows/container-build.yml +++ b/.github/workflows/container-build.yml @@ -49,9 +49,9 @@ jobs: - name: Replace VERSION if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' run: chmod +x ./misc/update-version.sh && ./misc/update-version.sh ${{ inputs.RELEASE }} - - name: Replace VERSION 1.5 - if: inputs.RELEASE == '1.5' - run: chmod +x ./misc/update-version.sh && ./misc/update-version.sh dev + - name: Replace VERSION 1.5-dev + if: inputs.RELEASE == '1.5-dev' + run: chmod +x ./misc/update-version.sh && ./misc/update-version.sh 1.5-dev - name: Setup SSH for ARM node if: inputs.CACHE_SUFFIX == 'arm' run: | diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 8417e2d60e..43f0db55f6 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -41,8 +41,8 @@ jobs: - name: Replace VERSION if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == 'ui' run: chmod +x ./misc/update-version.sh && ./misc/update-version.sh ${{ inputs.RELEASE }} - - name: Replace VERSION 1.5 - if: inputs.RELEASE == '1.5' + - name: Replace VERSION 1.5-dev + if: inputs.RELEASE == '1.5-dev' run: chmod +x ./misc/update-version.sh && ./misc/update-version.sh 1.5-dev - name: Extract arch run: | @@ -96,7 +96,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} # Build testing package image - name: Build package image - if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == 'ui' || inputs.RELEASE == '1.5' + if: inputs.RELEASE == 'testing' || inputs.RELEASE == 'dev' || inputs.RELEASE == 'ui' || inputs.RELEASE == '1.5-dev' uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0 with: context: . @@ -108,7 +108,7 @@ jobs: cache-to: type=gha,scope=${{ inputs.LINUX }}-${{ inputs.RELEASE }},mode=min # Build non-testing package image - name: Build package image - if: inputs.RELEASE != 'testing' && inputs.RELEASE != 'dev' && inputs.RELEASE != 'ui' && inputs.RELEASE != '1.5' + if: inputs.RELEASE != 'testing' && inputs.RELEASE != 'dev' && inputs.RELEASE != 'ui' && inputs.RELEASE != '1.5-dev' uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0 with: context: .