ryan-at-ld · ryan-at-ld · Dec 12, 2024 · Dec 11, 2024 · Dec 12, 2024 · Dec 12, 2024
diff --git a/.github/workflows/tagging.yaml b/.github/workflows/tagging.yaml
@@ -46,7 +46,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ssh-key: ${{ secrets.AUTO_TAGGING_DEPLOY_KEY }}
+          ssh-key: ${{ secrets.GHA_AUTO_TAGGING_DEPLOY_KEY }}
       - name: Parse the version files
         id: parse-version-files
         uses: actions/github-script@v7
@@ -148,10 +148,9 @@ jobs:
         id: create-release
         uses: actions/github-script@v7
         with:
-          retries: '3'
+          retries: 3
           script: |
-
-
+
             const m = JSON.parse(process.env.MODULE_VERSION);
 
             const sourceUrl = `git::ssh://git@github.com/${{ github.repository }}//${m.directory}?ref=${m.tag}`;
@@ -166,12 +165,12 @@ jobs:
             This release was generated by [run ${{ github.run_number }} of the "${{ github.workflow }}" workflow](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) after pull request #${{ github.event.number }} was merged.
             `;
 
-            if (context.payload.pull_request.state == 'closed') {
-            
+            if (context.payload.pull_request.merged) {
+
               // Create the tag using Git instead of the GitHub API because it is not possible to by-pass GitHub Rulesets with the GHA token.
               core.info("Creating the Git tag in the local repo.");
               await exec.exec('git', ['tag', m.tag]);
-            
+
               core.info("Pushing the Git tag.");
               await exec.exec('git', ['push', 'origin', 'tag', m.tag]);
 

diff --git a/resources/module-b/VERSION b/resources/module-b/VERSION
@@ -1 +1 @@
-1.1.1
+1.1.2
diff --git a/services/module-1/VERSION b/services/module-1/VERSION
@@ -1 +1 @@
-1.1.1
+1.2.0