Fix publish job merging to main by using PR

aws-containers · May 3, 2023 · 7d3f306 · 7d3f306
1 parent 468c4ea
commit 7d3f306
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/publish-build.yml b/.github/workflows/publish-build.yml
@@ -10,6 +10,7 @@ on:
 permissions:
   id-token: write
   contents: write
+  pull-requests: write
 
 jobs:
 
@@ -99,15 +100,12 @@ jobs:
     - uses: actions/checkout@v3
       with:
         ref: ${{ github.event.inputs.tag }}
-        
+
     - name: Merge to main
-      uses: devmasx/merge-branch@master
-      with:
-        type: now
-        from_branch: ${{ github.event.inputs.tag }}
-        target_branch: main
-        github_token: ${{ github.token }}
-        message: Release ${{ github.event.inputs.tag }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        gh pr create -B main -H release/${{ github.event.inputs.tag }} --title 'chore(release): ${{ github.event.inputs.tag }}' --body 'Generate pull request for release'
 
     - name: Build Changelog
       id: github_release

diff --git a/release-notes-configuration.json b/release-notes-configuration.json
@@ -26,6 +26,7 @@
     }
   ],
   "ignore_labels": [
+    "release",
     "deps",
     "dependabot"
   ],
@@ -45,6 +46,11 @@
       "pattern": "^chore(deps)",
       "on_property": "title",
       "target": "deps"
+    },
+    {
+      "pattern": "^chore(release)",
+      "on_property": "title",
+      "target": "release"
     }
   ]
 }