From e6eb26518bdb01c2d6fc6d046b35e57704dfcd9a Mon Sep 17 00:00:00 2001 From: Thomas Adam Date: Mon, 13 Jul 2026 09:13:28 +0100 Subject: [PATCH] build: don't exit --- .../workflows/update-openbsd-and-portable.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/update-openbsd-and-portable.yml b/.github/workflows/update-openbsd-and-portable.yml index 1894f52b9..de4c6ab20 100644 --- a/.github/workflows/update-openbsd-and-portable.yml +++ b/.github/workflows/update-openbsd-and-portable.yml @@ -116,18 +116,17 @@ jobs: if [ "$old_base" = "$new_base" ]; then echo "changed=false" >> "$GITHUB_OUTPUT" - echo "No new OpenBSD tmux commits to import." - exit 0 - fi + echo "No new OpenBSD tmux commits to import; continuing to portable merge." + else + 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 - echo "new openbsd-git is not a descendant of origin/openbsd-git; aborting." >&2 - exit 1 + git cherry-pick "$old_base..$new_base" + echo "changed=true" >> "$GITHUB_OUTPUT" fi - git cherry-pick "$old_base..$new_base" - echo "changed=true" >> "$GITHUB_OUTPUT" - - name: Push cutover repository if: steps.cutover.outputs.changed == 'true' run: |