From 272b044157843fbb7fc2c347e2d97d16eda3c797 Mon Sep 17 00:00:00 2001 From: Moritz Utcke Date: Mon, 28 Apr 2025 16:52:41 -0300 Subject: [PATCH] Update --- .../auto-merge-staging-into-main.yml | 51 ++++++++++--------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/.github/workflows/auto-merge-staging-into-main.yml b/.github/workflows/auto-merge-staging-into-main.yml index 1598cd7b..06069452 100644 --- a/.github/workflows/auto-merge-staging-into-main.yml +++ b/.github/workflows/auto-merge-staging-into-main.yml @@ -33,31 +33,32 @@ jobs: exit 1 fi - - name: Create or update PR from staging → main - if: steps.check.outcome == 'success' - id: cpr - run: | - # Checkout staging branch - git checkout staging - - # Create a new branch for the PR - git checkout -b auto-merge/staging-to-main - - # Push the new branch to the remote - git push origin auto-merge/staging-to-main - - # Create the pull request using the GitHub Action - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: "chore: auto-merge staging into main" - branch: auto-merge/staging-to-main - base: main - title: "Auto-merge staging into main" - body: | - This PR was created automatically by GitHub Actions. - It merges the latest `staging` into `main`. - draft: false + - name: Checkout auto-merge/staging-to-main + if: steps.check.outcome == 'success' + id: cpr + run: | + # Checkout staging branch + git checkout staging + + # Create a new branch for the PR + git checkout -b auto-merge/staging-to-main + + # Push the new branch to the remote + git push origin auto-merge/staging-to-main + + # Create the pull request using the GitHub Action + - name: Create PR from staging → main + uses: peter-evans/create-pull-request@v4 + with: + token: ${{ secrets.GITHUB_TOKEN }} + commit-message: "chore: auto-merge staging into main" + branch: auto-merge/staging-to-main + base: main + title: "Auto-merge staging into main" + body: | + This PR was created automatically by GitHub Actions. + It merges the latest `staging` into `main`. + draft: false - name: Enable auto-merge on PR if: steps.cpr.outputs.pull-request-number != ''