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.yml for branch prerel-8.1 #18889

Merged
merged 2 commits into from
Jan 30, 2024
Merged

Update auto-pr.yml for branch prerel-8.1 #18889

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0194a5
Update auto-pr.yml
skoc10 Jan 30, 2024
183d66d
Update auto-pr.yml
skoc10 Jan 30, 2024
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
20 changes: 10 additions & 10 deletions .github/workflows/auto-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -18,19 +18,19 @@ 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
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
Loading