Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update auto pr to 7.3 #16767

Merged
merged 1 commit into from
Jun 6, 2023
+5 −5
Merged

update auto pr to 7.3 #16767

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/auto-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Merge branch dev with rel-7.2
name: Merge branch rel-7.3 with rel-7.2
on:
push:
branches:
Expand All @@ -7,15 +7,15 @@ permissions:
contents: read

jobs:
merge-dev-with-rel-7-2:
merge-rel-7-3-with-rel-7-2:
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
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
ref: dev
ref: rel-7.3
- name: Reset promotion branch
run: |
git fetch origin rel-7.2:rel-7.2
Expand All @@ -24,7 +24,7 @@ jobs:
uses: peter-evans/create-pull-request@v3
with:
branch: auto-merge/rel-7-2/${{github.run_number}}
title: Merge branch dev with rel-7.2
body: This PR generated automatically to merge dev with rel-7.2. Please review the changed files before merging to prevent any errors that may occur.
title: Merge branch rel-7.3 with rel-7.2
body: This PR generated automatically to merge rel-7.3 with rel-7.2. Please review the changed files before merging to prevent any errors that may occur.
reviewers: ${{github.actor}}
token: ${{ github.token }}