From 8d3eaa0072671c7a78734ebda5fb3ce99b123ee4 Mon Sep 17 00:00:00 2001 From: selman koc <64414348+skoc10@users.noreply.github.com> Date: Tue, 2 Jun 2026 12:49:55 +0300 Subject: [PATCH] Update workflow to merge dev with rel-10.5 --- .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 9f3ddb4289..6c21bb6baf 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,13 +1,13 @@ -name: Merge branch rel-10.5 with rel-10.4 +name: Merge branch dev with rel-10.5 on: push: branches: - - rel-10.4 + - rel-10.5 permissions: contents: read jobs: - merge-rel-10-5-with-rel-10-4: + merge-dev-with-rel-10-5: 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.5 + ref: dev - name: Reset promotion branch run: | - git fetch origin rel-10.4:rel-10.4 - git reset --hard rel-10.4 + git fetch origin rel-10.5:rel-10.5 + git reset --hard rel-10.5 - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: - branch: auto-merge/rel-10-4/${{github.run_number}} - title: Merge branch rel-10.5 with rel-10.4 - body: This PR generated automatically to merge rel-10.5 with rel-10.4. Please review the changed files before merging to prevent any errors that may occur. + branch: auto-merge/rel-10-5/${{github.run_number}} + title: Merge branch dev with rel-10.5 + body: This PR generated automatically to merge dev with rel-10.5. 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-4/${{github.run_number}} --approve - gh pr merge auto-merge/rel-10-4/${{github.run_number}} --merge --auto --delete-branch + gh pr review auto-merge/rel-10-5/${{github.run_number}} --approve + gh pr merge auto-merge/rel-10-5/${{github.run_number}} --merge --auto --delete-branch