refactor(ci/cd): rename tag setting steps for clarity and update beta…

… tag handling
groenator · Jan 9, 2025 · a2709d8 · a2709d8
1 parent 9d5ca8d
commit a2709d8
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -80,7 +80,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set release tag as environment variable
-        id: set-tag
+        id: set-stable-tag
         run: |
           echo -e "LATEST_TAG=$(cat release)" >> $GITHUB_ENV
 
@@ -98,7 +98,7 @@ jobs:
             type=semver,pattern=v{{major}}.{{minor}}
             type=semver,pattern=v{{major}},enable=${{ !startsWith(github.ref, 'refs/tags/v') }}
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
-            type=raw,value=${{ steps.set-tag.outputs.LATEST_TAG }},enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
+            type=raw,value=${{ steps.set-stable-tag.outputs.LATEST_TAG }},enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
 
       # Build and push Stable Image
       - name: Short commit
@@ -148,7 +148,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set release tag as environment variable
-        id: set-tag
+        id: set-beta-tag
         run: |
           echo -e "BETA_TAG=$(cat beta-release)" >> $GITHUB_ENV
 
@@ -162,12 +162,12 @@ jobs:
             ghcr.io/groenator/iptvboss-docker-beta
           tags: |
             type=ref,event=pr
-            type=semver,pattern=v{{major}}.{{minor}}.{{patch}}
             type=semver,pattern=v{{major}}.{{minor}}
+            type=semver,pattern=v{{major}}.{{minor}}.{{patch}}
             type=semver,pattern=v{{major}},enable=${{ !startsWith(github.ref, 'refs/tags/v') }}
-            type=raw,value=${{ steps.set-tag.outputs.BETA_TAG }},enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
             type=raw,value=beta-latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
-
+            type=raw,value=${{ steps.set-beta-tag.outputs.BETA_TAG }},enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
+            
       # Build and push Beta Image
       - name: Short commit
         id: shortcommit