Skip to content

Commit

Permalink
Allow nightly to fail (#1288)
Browse files Browse the repository at this point in the history
  • Loading branch information
TheAngryByrd authored May 23, 2024
1 parent b43fe3a commit 5941ec3
Showing 1 changed file with 16 additions and 5 deletions.
21 changes: 16 additions & 5 deletions .github/workflows/auto-merge-main-to-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 5941ec3

Please sign in to comment.