From d078d5541d989c335e8092458ceda34c8f530b38 Mon Sep 17 00:00:00 2001 From: Christina Holland Date: Tue, 3 May 2022 15:54:13 -0700 Subject: [PATCH 1/2] Add a workflow to merge release into master --- .github/workflows/merge-release-branch.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/merge-release-branch.yml diff --git a/.github/workflows/merge-release-branch.yml b/.github/workflows/merge-release-branch.yml new file mode 100644 index 00000000000..bf66d41b582 --- /dev/null +++ b/.github/workflows/merge-release-branch.yml @@ -0,0 +1,22 @@ +name: Merge Release Into Master + +on: repository_dispatch + +jobs: + merge_to_master: + runs-on: ubuntu-latest + # Allow GITHUB_TOKEN to have write permissions + permissions: + contents: write + steps: + - name: Merge to master + uses: actions/github-script@0.9.0 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + script: | + github.repos.merge({ + owner: context.repo.owner, + repo: context.repo.repo, + base: 'master', + head: 'release' + }) \ No newline at end of file From d7c248586621b2bd169d9756925e9b7dbc69b0a7 Mon Sep 17 00:00:00 2001 From: Christina Holland Date: Wed, 4 May 2022 11:01:37 -0700 Subject: [PATCH 2/2] Bump to v6 --- .github/workflows/merge-release-branch.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/merge-release-branch.yml b/.github/workflows/merge-release-branch.yml index bf66d41b582..130c7a15312 100644 --- a/.github/workflows/merge-release-branch.yml +++ b/.github/workflows/merge-release-branch.yml @@ -10,13 +10,13 @@ jobs: contents: write steps: - name: Merge to master - uses: actions/github-script@0.9.0 + uses: actions/github-script@v6 with: github-token: ${{ secrets.GITHUB_TOKEN }} script: | - github.repos.merge({ - owner: context.repo.owner, - repo: context.repo.repo, - base: 'master', - head: 'release' - }) \ No newline at end of file + github.repos.merge({ + owner: context.repo.owner, + repo: context.repo.repo, + base: 'master', + head: 'release' + })