Skip to content

Commit 3186de8

Browse files
authored
Enable auto-merge for bot-created PRs (#22788)
It still needs a human to approve, but now there's one less button to press.
1 parent 6995a4e commit 3186de8

File tree

1 file changed

+5
-19
lines changed

1 file changed

+5
-19
lines changed

.github/workflows/tag-release.yml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,14 @@ jobs:
1818
- name: Update Changelog
1919
run: python3 tools/maint/create_release.py --action
2020
- name: Create Changelog PR
21+
id: cpr
2122
uses: peter-evans/create-pull-request@v6
2223
with:
2324
token: ${{ secrets.EMSCRIPTEN_BOT_TOKEN }}
2425
title: Mark ${{ env.RELEASE_VERSION }} as released
2526
team-reviewers: release-reviewers
2627
delete-branch: true
27-
- name: Tag release sha
28-
uses: actions/github-script@v7
29-
with:
30-
github-token: ${{ secrets.EMSCRIPTEN_BOT_TOKEN }}
31-
script: |
32-
const tag_sha = '${{ inputs.release-sha }}';
33-
const release_version = '${{ env.RELEASE_VERSION }}';
34-
console.log(`Version ${release_version} at SHA ${tag_sha}`);
35-
const regex = /^[0-9]+.[0-9]+.[0-9]+$/;
36-
const match = release_version.match(regex);
37-
if (!match) {
38-
throw new Error('Malformed release version');
39-
}
40-
await github.rest.git.createRef({
41-
owner: context.repo.owner,
42-
repo: context.repo.repo,
43-
ref: `refs/tags/${release_version}`,
44-
sha: tag_sha
45-
});
28+
- name: Enable auto-merge
29+
run: gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}"
30+
env:
31+
GH_TOKEN: ${{ secrets.EMSCRIPTEN_BOT_TOKEN }}

0 commit comments

Comments
 (0)