From 380cf8023aa21395a6621c058072b74fc9d52b6c Mon Sep 17 00:00:00 2001 From: selman koc <64414348+skoc10@users.noreply.github.com> Date: Tue, 31 Mar 2026 14:30:58 +0300 Subject: [PATCH] Update workflow to merge dev with rel-10.3 --- .github/workflows/auto-pr.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index ec7ba474f0..6f36836d6c 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,13 +1,13 @@ -name: Merge branch dev with rel-10.2 +name: Merge branch dev with rel-10.3 on: push: branches: - - rel-10.2 + - rel-10.3 permissions: contents: read jobs: - merge-dev-with-rel-10-2: + merge-dev-with-rel-10-3: 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 @@ -18,14 +18,14 @@ jobs: ref: dev - name: Reset promotion branch run: | - git fetch origin rel-10.2:rel-10.2 - git reset --hard rel-10.2 + git fetch origin rel-10.3:rel-10.3 + git reset --hard rel-10.3 - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: - branch: auto-merge/rel-10-2/${{github.run_number}} - title: Merge branch dev with rel-10.2 - body: This PR generated automatically to merge dev with rel-10.2. Please review the changed files before merging to prevent any errors that may occur. + branch: auto-merge/rel-10-3/${{github.run_number}} + title: Merge branch dev with rel-10.3 + body: This PR generated automatically to merge dev with rel-10.3. 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-2/${{github.run_number}} --approve - gh pr merge auto-merge/rel-10-2/${{github.run_number}} --merge --auto --delete-branch + gh pr review auto-merge/rel-10-3/${{github.run_number}} --approve + gh pr merge auto-merge/rel-10-3/${{github.run_number}} --merge --auto --delete-branch