From 7be2bfa46ecf2208ee829cdf3841e918e5d58155 Mon Sep 17 00:00:00 2001 From: selman koc <64414348+skoc10@users.noreply.github.com> Date: Tue, 30 Dec 2025 10:55:56 +0300 Subject: [PATCH] Update GitHub Actions workflow for branch merging --- .github/workflows/auto-pr.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 80d0acd30f..4cb89fd21d 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,13 +1,13 @@ -name: Merge branch rel-10.1 with rel-10.0 +name: Merge branch dev with rel-10.1 on: push: branches: - - rel-10.0 + - rel-10.1 permissions: contents: read jobs: - merge-rel-10-1-with-rel-10-0: + merge-dev-with-rel-10-1: permissions: contents: write # for peter-evans/create-pull-request to create branch pull-requests: write # for peter-evans/create-pull-request to create a PR @@ -15,17 +15,17 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: rel-10.1 + ref: dev - name: Reset promotion branch run: | - git fetch origin rel-10.0:rel-10.0 - git reset --hard rel-10.0 + git fetch origin rel-10.1:rel-10.1 + git reset --hard rel-10.1 - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: - branch: auto-merge/rel-10-0/${{github.run_number}} - title: Merge branch rel-10.1 with rel-10.0 - body: This PR generated automatically to merge rel-10.1 with rel-10.0. Please review the changed files before merging to prevent any errors that may occur. + branch: auto-merge/rel-10-1/${{github.run_number}} + title: Merge branch dev with rel-10.1 + body: This PR generated automatically to merge dev with rel-10.1. Please review the changed files before merging to prevent any errors that may occur. reviewers: maliming draft: true token: ${{ github.token }} @@ -34,5 +34,5 @@ jobs: GH_TOKEN: ${{ secrets.BOT_SECRET }} run: | gh pr ready - gh pr review auto-merge/rel-10-0/${{github.run_number}} --approve - gh pr merge auto-merge/rel-10-0/${{github.run_number}} --merge --auto --delete-branch + gh pr review auto-merge/rel-10-1/${{github.run_number}} --approve + gh pr merge auto-merge/rel-10-1/${{github.run_number}} --merge --auto --delete-branch