Skip to content

Commit

Permalink
Add name and email for commit
Browse files Browse the repository at this point in the history
  • Loading branch information
charleshofer committed Nov 14, 2024
1 parent 007f982 commit cb5f909
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/rocm-nightly-upstream-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ jobs:
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 "[email protected]"
git config --global user.name "GitHub Actions"
git merge origin/rocm-main || true
# If the merge creates conflicts, we want to abort and push to origin anyways so that a dev can resolve the conflicts
git merge --abort || true
Expand Down

0 comments on commit cb5f909

Please sign in to comment.