build(docker): fix docker release workflow

Signed-off-by: Stefan Dej <[email protected]>

.github/workflows/publish_docker.yml

@@ -25,6 +25,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Log in to the Container registry
+        if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
@@ -42,6 +43,7 @@ jobs:
             type=semver,pattern=v{{major}}
             type=semver,pattern=v{{major}}.{{minor}}
             type=semver,pattern=v{{major}}.{{minor}}.{{patch}}
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 

.github/workflows/release.yml

@@ -9,14 +9,25 @@ on:
         required: true
 
 jobs:
+  update-master-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: everlytic/[email protected]
+        with:
+          github_token: ${{ secrets.PAT }}
+          source_ref: 'develop'
+          target_branch: 'master'
+          commit_message_template: '[Automated] Merged {source_ref} into target {target_branch}'
+
   push-version-number:
+    needs: ['update-master-branch']
     runs-on: ubuntu-latest
     steps:
-      - name: Clone develop repository
+      - name: Checkout master branch
         uses: actions/checkout@v4
         with:
           token: ${{ secrets.PAT }}
-          ref: 'develop'
+          ref: 'master'
 
       - name: get-npm-version
         id: package-version
@@ -37,19 +48,8 @@ jobs:
           message: 'chore: push version number to v${{ github.event.inputs.version }}'
           push: true
 
-  update-master-branch:
-    needs: ['push-version-number']
-    runs-on: ubuntu-latest
-    steps:
-      - uses: everlytic/[email protected]
-        with:
-          github_token: ${{ secrets.PAT }}
-          source_ref: 'develop'
-          target_branch: 'master'
-          commit_message_template: '[Automated] Merged {source_ref} into target {target_branch}'
-
   release:
-    needs: ['update-master-branch']
+    needs: ['push-version-number']
     runs-on: ubuntu-latest
     steps:
       - name: Fetch repo
@@ -110,6 +110,16 @@ jobs:
           exclude: .htaccess
           local-dir: ./dist/
 
+  update-develop-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: everlytic/[email protected]
+        with:
+          github_token: ${{ secrets.PAT }}
+          source_ref: 'master'
+          target_branch: 'develop'
+          commit_message_template: '[Automated] Merged {source_ref} into target {target_branch}'
+
   update-changelog:
     needs: ['release']
     name: Generate changelog