mirrors/rocm_jax
1
0
Fork 0
mirror of https://github.com/ROCm/jax.git synced 2025-04-14 10:56:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use rebase for upstream sync (#325)

Browse Source
This commit is contained in:
charleshofer 2025-03-27 11:58:59 -05:00 committed by GitHub
parent ec4b8ee1ed
commit 7b20b7c0b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/rocm-nightly-upstream-sync.yml vendored
View File

@ -38,7 +38,7 @@ jobs:
- name: Create branch
run: |
git fetch
git checkout origin/main
git checkout origin/main
git checkout -b $SYNC_BRANCH_NAME
# Try and merge rocm-main into this new branch so that we don't run upstream's CI code
git config --global user.email "github-actions@github.com"
@ -60,7 +60,7 @@ jobs:
- name: Open a PR to rocm-main
run: |
gh pr create --repo $GITHUB_REPOSITORY --head $SYNC_BRANCH_NAME --base rocm-main --title "CI: $(date +%x) upstream sync" --body "Daily sync with upstream"
gh pr merge --repo $GITHUB_REPOSITORY --merge --auto $SYNC_BRANCH_NAME
gh pr merge --repo $GITHUB_REPOSITORY --rebase --auto $SYNC_BRANCH_NAME
env:
GH_TOKEN: ${{ steps.generate-token.outputs.token }}