From 22dc3be6c3f8b34c30cf4071d2a165517dc7475b Mon Sep 17 00:00:00 2001 From: Johannes Obermair Date: Wed, 28 Feb 2024 10:42:51 +0100 Subject: [PATCH] Fix main-into-next-pr workflow See https://github.com/vivid-planet/comet/pull/1767. --- .github/workflows/main-into-next-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main-into-next-pr.yml b/.github/workflows/main-into-next-pr.yml index cebefabbf..996cf2bdc 100644 --- a/.github/workflows/main-into-next-pr.yml +++ b/.github/workflows/main-into-next-pr.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # Needed to also fetch next branch @@ -36,7 +36,7 @@ jobs: echo 'PR_BODY=This is an automated pull request to merge changes from `main` into `next`. It has merge conflicts. To resolve conflicts, check out the branch `merge-main-into-next` locally, make any necessary changes to conflicting files, and commit and publish your changes.' >> $GITHUB_ENV - name: Create pull request - uses: peter-evans/create-pull-request@v5 + uses: peter-evans/create-pull-request@v6 with: token: ${{ secrets.GITHUB_TOKEN }} title: ${{ env.PR_TITLE }}