Merge pull request #152 from monta-app/fix/changelog-and-tag-skipped

EliasJorgensen · web-flow · commit 22fa3ab82bd6 · 2025-08-21T14:28:27.000+02:00
fix: Try fixing tag and changelog creation being skipped in deploy-kotlin
diff --git a/.github/workflows/create-release-tag.yml b/.github/workflows/create-release-tag.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.MONTA_BOT_TOKEN }}
       - name: Generate tag name
         id: generate_tag
         run: |
@@ -39,8 +39,8 @@ jobs:
           tag="${{ steps.generate_tag.outputs.tag }}"
 
           # Configure git
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git config user.name "Monta Bot"
+          git config user.email "bot@monta.com"
 
           # Create the tag
           git tag "$tag"
diff --git a/.github/workflows/deploy-kotlin.yml b/.github/workflows/deploy-kotlin.yml
@@ -122,12 +122,6 @@ permissions:
   actions: write
 
 jobs:
-  create-release-tag:
-    name: Create Release Tag
-    if: inputs.enable-release-tag && github.event_name == 'workflow_dispatch'
-    uses: ./.github/workflows/create-release-tag.yml
-    with:
-      prefix: ${{ inputs.release-tag-prefix }}
   initialize:
     name: Initialize
     needs: [ create-release-tag ]
@@ -199,10 +193,17 @@ jobs:
     secrets:
       MANIFEST_REPO_PAT: ${{ secrets.MANIFEST_REPO_PAT }}
       SLACK_APP_TOKEN: ${{ secrets.SLACK_APP_TOKEN }}
+  create-release-tag:
+    name: Create Release Tag
+    if: always() && inputs.enable-release-tag && needs.deploy.result == 'success'
+    needs: deploy
+    uses: ./.github/workflows/create-release-tag.yml
+    with:
+      prefix: ${{ inputs.release-tag-prefix }}
   create-changelog:
     name: Create and Publish Changelog
     needs: deploy
-    if: inputs.enable-changelog && needs.deploy.result == 'success'
+    if: always() && inputs.enable-changelog && needs.deploy.result == 'success'
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
