Merge pull request #2047 from woocommerce/dev/release-merge-pr

woocommerce · Aug 9, 2023 · e1a0388 · e1a0388
2 parents 1a4e8fa + a8b1aeb
commit e1a0388
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 19 deletions.
diff --git a/.github/workflows/post-release-automerge.yml b/.github/workflows/post-release-automerge.yml
diff --git a/.github/workflows/post-release-merge.yml 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