From 60f67727feb9a2ec8ceb9c6a89c0d4de4f13eefe Mon Sep 17 00:00:00 2001 From: Jared Tobin Date: Thu, 14 Jan 2021 15:46:46 +0900 Subject: [PATCH 1/2] meta: stage adjusted merge workflow Uses janeway-bot's token, rather than the default GitHub Actions token, to allow the merge workflow to trigger others. --- .github/workflows/merge.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 282153d55..33fd2a71d 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -2,7 +2,7 @@ name: merge on: push: branches: - - 'master' + - 'jt/merge-via-bot' jobs: merge-to-next-js: runs-on: ubuntu-latest @@ -12,6 +12,6 @@ jobs: - uses: devmasx/merge-branch@v1.3.1 with: type: now - target_branch: release/next-js - github_token: ${{ github.token }} + target_branch: jt/testo + github_token: ${{ secrets.JANEWAY_BOT_TOKEN }} From 67c57c98c54118cd8778c6227427ef0850317c6c Mon Sep 17 00:00:00 2001 From: Jared Tobin Date: Thu, 14 Jan 2021 15:49:59 +0900 Subject: [PATCH 2/2] meta: activate adjusted merge workflow --- .github/workflows/merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 33fd2a71d..ff520c265 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -2,7 +2,7 @@ name: merge on: push: branches: - - 'jt/merge-via-bot' + - 'master' jobs: merge-to-next-js: runs-on: ubuntu-latest @@ -12,6 +12,6 @@ jobs: - uses: devmasx/merge-branch@v1.3.1 with: type: now - target_branch: jt/testo + target_branch: release/next-js github_token: ${{ secrets.JANEWAY_BOT_TOKEN }}