From 4769dd8873f980454bb8bfcca151675d8bf97c02 Mon Sep 17 00:00:00 2001 From: selman koc <64414348+skoc10@users.noreply.github.com> Date: Tue, 4 Aug 2026 12:13:37 +0300 Subject: [PATCH 1/2] Update workflow to merge rel-10.7 with rel-10.6 --- .github/workflows/auto-pr.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index d8a1d0b8d7..3306b3ca62 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,4 +1,4 @@ -name: Merge branch dev with rel-10.6 +name: Merge branch rel-10.7 with rel-10.6 on: push: branches: @@ -7,7 +7,7 @@ permissions: contents: read jobs: - merge-dev-with-rel-10-6: + merge-rel-10-7-with-rel-10-6: 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,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: dev + ref: rel-10.7 - name: Reset promotion branch run: | git fetch origin rel-10.6:rel-10.6 @@ -24,8 +24,8 @@ jobs: uses: peter-evans/create-pull-request@v3 with: branch: auto-merge/rel-10-6/${{github.run_number}} - title: Merge branch dev with rel-10.6 - body: This PR generated automatically to merge dev with rel-10.6. Please review the changed files before merging to prevent any errors that may occur. + title: Merge branch rel-10.7 with rel-10.6 + body: This PR generated automatically to merge rel-10.7 with rel-10.6. Please review the changed files before merging to prevent any errors that may occur. draft: true token: ${{ github.token }} - name: Merge Pull Request From 3177b8e51318b42b2e592b17a9a50d516576a598 Mon Sep 17 00:00:00 2001 From: selman koc <64414348+skoc10@users.noreply.github.com> Date: Tue, 4 Aug 2026 12:19:17 +0300 Subject: [PATCH 2/2] Update workflow to merge dev with rel-10.7 --- .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 3306b3ca62..fb800ff51e 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,13 +1,13 @@ -name: Merge branch rel-10.7 with rel-10.6 +name: Merge branch dev with rel-10.7 on: push: branches: - - rel-10.6 + - rel-10.7 permissions: contents: read jobs: - merge-rel-10-7-with-rel-10-6: + merge-dev-with-rel-10-7: 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.7 + ref: dev - name: Reset promotion branch run: | - git fetch origin rel-10.6:rel-10.6 - git reset --hard rel-10.6 + git fetch origin rel-10.7:rel-10.7 + git reset --hard rel-10.7 - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: - branch: auto-merge/rel-10-6/${{github.run_number}} - title: Merge branch rel-10.7 with rel-10.6 - body: This PR generated automatically to merge rel-10.7 with rel-10.6. Please review the changed files before merging to prevent any errors that may occur. + branch: auto-merge/rel-10-7/${{github.run_number}} + title: Merge branch dev with rel-10.7 + body: This PR generated automatically to merge dev with rel-10.7. Please review the changed files before merging to prevent any errors that may occur. draft: true token: ${{ github.token }} - name: Merge Pull Request @@ -33,5 +33,5 @@ jobs: GH_TOKEN: ${{ secrets.BOT_SECRET }} run: | gh pr ready - gh pr review auto-merge/rel-10-6/${{github.run_number}} --approve - gh pr merge auto-merge/rel-10-6/${{github.run_number}} --merge --auto --delete-branch + gh pr review auto-merge/rel-10-7/${{github.run_number}} --approve + gh pr merge auto-merge/rel-10-7/${{github.run_number}} --merge --auto --delete-branch