-
Notifications
You must be signed in to change notification settings - Fork 156
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
b43fe3a
commit 5941ec3
Showing
1 changed file
with
16 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,10 +18,21 @@ jobs: | |
with: | ||
ref: nightly | ||
fetch-depth: 0 # need all history to merge main | ||
|
||
# workaround for allow-failure not existing : https://github.com/orgs/community/discussions/15452#discussioncomment-6012299 | ||
- name: Merge main to nightly | ||
run: | | ||
git config user.name "GitHub Actions" | ||
git config user.email "[email protected]" | ||
git merge origin/main -m "merge main to nightly" --no-edit | ||
git push origin nightly | ||
# | ||
set +e | ||
set +o pipefail | ||
function wrap_command() { | ||
git config user.name "GitHub Actions" | ||
git config user.email "[email protected]" | ||
git merge origin/main -m "merge main to nightly" --no-edit | ||
git push origin nightly | ||
} | ||
wrap_command | ||
echo $? | ||
exit 0 | ||