From 912d284a1815a9aa756cfa2b147623cce1f0a1e2 Mon Sep 17 00:00:00 2001 From: Ondrej Mirtes Date: Mon, 29 May 2023 20:55:25 +0200 Subject: [PATCH] Merge maintained branch workflow --- .github/workflows/merge-maintained-branch.yml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/merge-maintained-branch.yml diff --git a/.github/workflows/merge-maintained-branch.yml b/.github/workflows/merge-maintained-branch.yml new file mode 100644 index 00000000..6ea17262 --- /dev/null +++ b/.github/workflows/merge-maintained-branch.yml @@ -0,0 +1,23 @@ +# https://help.github.com/en/categories/automating-your-workflow-with-github-actions + +name: Merge maintained branch + +on: + push: + branches: + - "1.21.x" + +jobs: + merge: + name: Merge branch + runs-on: ubuntu-latest + steps: + - name: "Checkout" + uses: actions/checkout@v3 + - name: "Merge branch" + uses: everlytic/branch-merge@1.1.5 + with: + github_token: "${{ secrets.PHPSTAN_BOT_TOKEN }}" + source_ref: ${{ github.ref }} + target_branch: '1.22.x' + commit_message_template: 'Merge branch {source_ref} into {target_branch}'