Skip to content

Commit fe26f3f

Browse files
authored
Revert "Enable auto-merge for bot-created PRs" (#22955)
Reverts #22788 Oops, I left my testing code in.
1 parent 3186de8 commit fe26f3f

File tree

1 file changed

+19
-5
lines changed

1 file changed

+19
-5
lines changed

.github/workflows/tag-release.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,28 @@ jobs:
1818
- name: Update Changelog
1919
run: python3 tools/maint/create_release.py --action
2020
- name: Create Changelog PR
21-
id: cpr
2221
uses: peter-evans/create-pull-request@v6
2322
with:
2423
token: ${{ secrets.EMSCRIPTEN_BOT_TOKEN }}
2524
title: Mark ${{ env.RELEASE_VERSION }} as released
2625
team-reviewers: release-reviewers
2726
delete-branch: true
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 }}
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+
});

0 commit comments

Comments
 (0)