From 5278a12aefb3b5140517258fcc2409fbc695c921 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Thu, 24 Oct 2024 17:51:36 -0700 Subject: [PATCH 1/4] Enable auto-merge for bot-created PRs --- .github/workflows/tag-release.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 3ee22945a3a50..3a3f7b0fb6e02 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -18,12 +18,17 @@ jobs: - name: Update Changelog run: python3 tools/maint/create_release.py --action - name: Create Changelog PR + id: cpr uses: peter-evans/create-pull-request@v6 with: token: ${{ secrets.EMSCRIPTEN_BOT_TOKEN }} title: Mark ${{ env.RELEASE_VERSION }} as released team-reviewers: release-reviewers delete-branch: true + - name: Enable auto-merge + run: gh pr merge --merge --auto "${{ steps.cpr.outputs.pull-request-number }}" + env: + GH_TOKEN: ${{ secrets.EMSCRIPTEN_BOT_TOKEN }} - name: Tag release sha uses: actions/github-script@v7 with: From 06d628630acb94d4ab8050de3fd19e39646cbb16 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Thu, 24 Oct 2024 17:54:13 -0700 Subject: [PATCH 2/4] Update tag-release.yml --- .github/workflows/tag-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 3a3f7b0fb6e02..fd44eb7c80551 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -26,7 +26,7 @@ jobs: team-reviewers: release-reviewers delete-branch: true - name: Enable auto-merge - run: gh pr merge --merge --auto "${{ steps.cpr.outputs.pull-request-number }}" + run: gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}" env: GH_TOKEN: ${{ secrets.EMSCRIPTEN_BOT_TOKEN }} - name: Tag release sha From 906c7fcf1a2042dfa4c158ebd2bdb60adf9eae10 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Mon, 18 Nov 2024 15:06:33 -0800 Subject: [PATCH 3/4] test without actually tagging --- .github/workflows/tag-release.yml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index fd44eb7c80551..9bdda11a7154f 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -29,22 +29,3 @@ jobs: run: gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}" env: GH_TOKEN: ${{ secrets.EMSCRIPTEN_BOT_TOKEN }} - - name: Tag release sha - uses: actions/github-script@v7 - with: - github-token: ${{ secrets.EMSCRIPTEN_BOT_TOKEN }} - script: | - const tag_sha = '${{ inputs.release-sha }}'; - const release_version = '${{ env.RELEASE_VERSION }}'; - console.log(`Version ${release_version} at SHA ${tag_sha}`); - const regex = /^[0-9]+.[0-9]+.[0-9]+$/; - const match = release_version.match(regex); - if (!match) { - throw new Error('Malformed release version'); - } - await github.rest.git.createRef({ - owner: context.repo.owner, - repo: context.repo.repo, - ref: `refs/tags/${release_version}`, - sha: tag_sha - }); From 782b2b0943d928ae0f65fb2c0b337361d365dc61 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Mon, 18 Nov 2024 17:04:16 -0800 Subject: [PATCH 4/4] Revert "test without actually tagging" This reverts commit 906c7fcf1a2042dfa4c158ebd2bdb60adf9eae10. --- .github/workflows/tag-release.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 9bdda11a7154f..fd44eb7c80551 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -29,3 +29,22 @@ jobs: run: gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}" env: GH_TOKEN: ${{ secrets.EMSCRIPTEN_BOT_TOKEN }} + - name: Tag release sha + uses: actions/github-script@v7 + with: + github-token: ${{ secrets.EMSCRIPTEN_BOT_TOKEN }} + script: | + const tag_sha = '${{ inputs.release-sha }}'; + const release_version = '${{ env.RELEASE_VERSION }}'; + console.log(`Version ${release_version} at SHA ${tag_sha}`); + const regex = /^[0-9]+.[0-9]+.[0-9]+$/; + const match = release_version.match(regex); + if (!match) { + throw new Error('Malformed release version'); + } + await github.rest.git.createRef({ + owner: context.repo.owner, + repo: context.repo.repo, + ref: `refs/tags/${release_version}`, + sha: tag_sha + });