From f0194a58575f1bb33f0610aaa252c136739a591e Mon Sep 17 00:00:00 2001 From: selman koc <64414348+skoc10@users.noreply.github.com> Date: Tue, 30 Jan 2024 10:59:38 +0300 Subject: [PATCH 1/2] Update auto-pr.yml --- .github/workflows/auto-pr.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 5587120951f..e9fe77a6611 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,13 +1,13 @@ -name: Merge branch dev with rel-8.0 +name: Merge branch dev with prerel-8.1 on: push: branches: - - rel-8.0 + - prerel-8.1 permissions: contents: read jobs: - merge-dev-with-rel-8-0: + merge-dev-with-prerel-8-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 @@ -18,14 +18,14 @@ jobs: ref: dev - name: Reset promotion branch run: | - git fetch origin rel-8.0:rel-8.0 - git reset --hard rel-8.0 + git fetch origin prerel-8.1:prerel-8.1 + git reset --hard prerel-8.1 - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: - branch: auto-merge/rel-8-0/${{github.run_number}} - title: Merge branch dev with rel-8.0 - body: This PR generated automatically to merge dev with rel-8.0. Please review the changed files before merging to prevent any errors that may occur. + branch: auto-merge/prerel-8-1/${{github.run_number}} + title: Merge branch dev with prerel-8.1 + body: This PR generated automatically to merge dev with prerel-8.1. Please review the changed files before merging to prevent any errors that may occur. reviewers: maliming token: ${{ github.token }} - name: Merge Pull Request From 183d66d84264961a92477e4be5760fe0b5306ee8 Mon Sep 17 00:00:00 2001 From: selman koc <64414348+skoc10@users.noreply.github.com> Date: Tue, 30 Jan 2024 11:13:05 +0300 Subject: [PATCH 2/2] Update auto-pr.yml --- .github/workflows/auto-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index e9fe77a6611..164d23fdb58 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -32,5 +32,5 @@ jobs: env: GH_TOKEN: ${{ secrets.BOT_SECRET }} run: | - gh pr review auto-merge/rel-8-0/${{github.run_number}} --approve - gh pr merge auto-merge/rel-8-0/${{github.run_number}} --merge --auto --delete-branch + gh pr review auto-merge/prerel-8-1/${{github.run_number}} --approve + gh pr merge auto-merge/prerel-8-1/${{github.run_number}} --merge --auto --delete-branch