circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-09 19:54:22 +00:00
Code Issues Projects Releases Wiki Activity

build: don't exit

Browse Source
This commit is contained in:
Thomas Adam
2026-07-13 09:13:28 +01:00
parent 8b2bc1a384
commit e6eb26518b
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
.github/workflows/update-openbsd-and-portable.yml vendored
View File

@@ -116,18 +116,17 @@ jobs:
if [ "$old_base" = "$new_base" ]; then if [ "$old_base" = "$new_base" ]; then
echo "changed=false" >> "$GITHUB_OUTPUT" echo "changed=false" >> "$GITHUB_OUTPUT"
echo "No new OpenBSD tmux commits to import." echo "No new OpenBSD tmux commits to import; continuing to portable merge."
exit 0 else
fi if ! git merge-base --is-ancestor "$old_base" "$new_base"; then
echo "new openbsd-git is not a descendant of origin/openbsd-git; aborting." >&2
exit 1
fi
if ! git merge-base --is-ancestor "$old_base" "$new_base"; then git cherry-pick "$old_base..$new_base"
echo "new openbsd-git is not a descendant of origin/openbsd-git; aborting." >&2 echo "changed=true" >> "$GITHUB_OUTPUT"
exit 1
fi fi
git cherry-pick "$old_base..$new_base"
echo "changed=true" >> "$GITHUB_OUTPUT"
- name: Push cutover repository - name: Push cutover repository
if: steps.cutover.outputs.changed == 'true' if: steps.cutover.outputs.changed == 'true'
run: | run: |