From 01bd0f4539e61d23b1cc5fb4a48f0055432c33fc Mon Sep 17 00:00:00 2001 From: kirillcoso <148554583+kirillcoso@users.noreply.github.com> Date: Tue, 8 Oct 2024 13:30:26 +0100 Subject: [PATCH 1/3] Update updater.yml --- .github/workflows/updater.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index f55d255fc..46731636e 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -99,6 +99,12 @@ jobs: echo "Using dependabot-updater image tag '$tag_sha' (v$tag_name)" echo "version=$tag_sha" >> $GITHUB_OUTPUT + - name: Remove + from fullSemVer + id: remove_plus + run: | + cleanedFullSemVer=$(echo "${{ steps.gitversion.outputs.fullSemVer }}" | tr -d '+') + echo "::set-output name=cleanedFullSemVer::$cleanedFullSemVer" + - name: Build image run: | docker build \ @@ -114,11 +120,11 @@ jobs: --label com.github.image.source.branch=${{ github.ref }} \ -t "ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:latest" \ -t "ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ steps.gitversion.outputs.shortSha }}" \ - -t "ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ steps.gitversion.outputs.fullSemVer }}" \ + -t "ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ steps.remove_plus.outputs.cleanedFullSemVer }}" \ -t "ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ steps.gitversion.outputs.major}}.${{ steps.gitversion.outputs.minor }}" \ -t "ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ steps.gitversion.outputs.major }}" \ --cache-from ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:latest \ - . + . - name: Log into registry if: ${{ (github.ref == 'refs/heads/main') || (!startsWith(github.ref, 'refs/pull')) || startsWith(github.ref, 'refs/tags') }} From 284fb68afea3d4b562a87d7a846b2d68e1f6d865 Mon Sep 17 00:00:00 2001 From: kirillcoso <148554583+kirillcoso@users.noreply.github.com> Date: Tue, 8 Oct 2024 13:42:19 +0100 Subject: [PATCH 2/3] Update updater.yml --- .github/workflows/updater.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index 46731636e..c2ce890bb 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -124,7 +124,7 @@ jobs: -t "ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ steps.gitversion.outputs.major}}.${{ steps.gitversion.outputs.minor }}" \ -t "ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ steps.gitversion.outputs.major }}" \ --cache-from ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:latest \ - . + . - name: Log into registry if: ${{ (github.ref == 'refs/heads/main') || (!startsWith(github.ref, 'refs/pull')) || startsWith(github.ref, 'refs/tags') }} From be235a2faa052c5e7b06a106015528479d595395 Mon Sep 17 00:00:00 2001 From: kirillcoso <148554583+kirillcoso@users.noreply.github.com> Date: Tue, 8 Oct 2024 13:44:40 +0100 Subject: [PATCH 3/3] Update updater.yml --- .github/workflows/updater.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index c2ce890bb..3ef2469e8 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -138,7 +138,7 @@ jobs: - name: Push image (NuGetVersionV2) if: ${{ !startsWith(github.ref, 'refs/pull') }} - run: docker push "ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ steps.gitversion.outputs.fullSemVer }}" + run: docker push "ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ steps.remove_plus.outputs.cleanedFullSemVer }}" - name: Push image (major, minor) if: startsWith(github.ref, 'refs/tags')