From 8cdd439fc0b11c9e7b0fdb044484992bd0264e01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Muhammed=20Altu=C4=9F?= Date: Mon, 14 Nov 2022 10:00:38 +0300 Subject: [PATCH 1/2] Update auto pr rel-6.0 --- .github/workflows/auto-pr.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 1d9a8750e6..8a1e91133b 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,4 +1,4 @@ -name: Merge branch dev with rel-6.0 +name: Merge branch rel-6.0 with rel-7.0 on: push: branches: @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: dev + ref: rel-7.0 - name: Reset promotion branch run: | git fetch origin rel-6.0:rel-6.0 @@ -24,7 +24,7 @@ jobs: uses: peter-evans/create-pull-request@v3 with: branch: auto-merge/rel-6-0/${{github.run_number}} - title: Merge branch dev with rel-6.0 - body: This PR generated automatically to merge dev with rel-6.0. Please review the changed files before merging to prevent any errors that may occur. + title: Merge branch rel-7.0 with rel-6.0 + body: This PR generated automatically to merge rel-7.0 with rel-6.0. Please review the changed files before merging to prevent any errors that may occur. reviewers: ${{github.actor}} token: ${{ github.token }} From 65154eef90c4b068bad1e493a28424dc3d8501c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Muhammed=20Altu=C4=9F?= Date: Mon, 14 Nov 2022 10:02:21 +0300 Subject: [PATCH 2/2] update --- .github/workflows/auto-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 8a1e91133b..4bb4962815 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,4 +1,4 @@ -name: Merge branch rel-6.0 with rel-7.0 +name: Merge branch rel-7.0 with rel-6.0 on: push: branches: