From a8b1aebda7674ba3b6ef2fec27196fca14b957f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomek=20Wytr=C4=99bowicz?= Date: Mon, 7 Aug 2023 21:46:58 +0200 Subject: [PATCH] Use `merge-trunk-develop-pr` action instead of `automerge-released-trunk`. We need a manual PR merge due to our branch protection rules. --- .github/workflows/post-release-automerge.yml | 19 ------------------- .github/workflows/post-release-merge.yml | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 19 deletions(-) delete mode 100644 .github/workflows/post-release-automerge.yml create mode 100644 .github/workflows/post-release-merge.yml diff --git a/.github/workflows/post-release-automerge.yml b/.github/workflows/post-release-automerge.yml deleted file mode 100644 index 8555f5c4fa..0000000000 --- a/.github/workflows/post-release-automerge.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: 'Merge the release to develop' -run-name: Merge the released `${{ github.head_ref }}` from `trunk` to `develop` - -# **What it does**: Merges trunk to develop after `release/*` is merged to `trunk`. -# **Why we have it**: To automate the release process and follow git-flow. - -on: - pull_request: - types: - - closed - branches: - - trunk - -jobs: - automerge_trunk: - name: Automerge released trunk - runs-on: ubuntu-latest - steps: - - uses: woocommerce/grow/automerge-released-trunk@actions-v1 diff --git a/.github/workflows/post-release-merge.yml b/.github/workflows/post-release-merge.yml new file mode 100644 index 0000000000..bbdf939fdf --- /dev/null +++ b/.github/workflows/post-release-merge.yml @@ -0,0 +1,18 @@ +name: 'Merge the release to develop' +run-name: Make a PR to merge the released `${{ github.head_ref }}` from `trunk` to `develop` + +# **What it does**: Creates a PR to merge `trunk` to `develop` after `prepare-extension-release`-based release is merged to `trunk`. +# **Why we have it**: To automate the release process and follow the git-flow. + +on: + pull_request: + types: + - closed + branches: + - trunk + +jobs: + MergeTrunkDevelopPR: + runs-on: ubuntu-latest + steps: + - uses: woocommerce/grow/merge-trunk-develop-pr@actions-v1