From 8b2bc1a3841f34bb3ceade4e21c82a3a2bf5a2c2 Mon Sep 17 00:00:00 2001 From: Thomas Adam Date: Mon, 13 Jul 2026 09:10:24 +0100 Subject: [PATCH] build: always attempt portable merge --- .github/workflows/update-openbsd-and-portable.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-openbsd-and-portable.yml b/.github/workflows/update-openbsd-and-portable.yml index c5b592dc9..1894f52b9 100644 --- a/.github/workflows/update-openbsd-and-portable.yml +++ b/.github/workflows/update-openbsd-and-portable.yml @@ -137,7 +137,7 @@ jobs: git push origin master openbsd-git - name: Merge cutover into portable - if: steps.cutover.outputs.changed == 'true' + id: portable run: | set -eu @@ -153,9 +153,14 @@ jobs: git fetch --no-tags tmux-openbsd master:refs/remotes/tmux-openbsd/master git switch master git merge --no-ff --log refs/remotes/tmux-openbsd/master + if git diff --quiet origin/master..master; then + echo "changed=false" >> "$GITHUB_OUTPUT" + else + echo "changed=true" >> "$GITHUB_OUTPUT" + fi - name: Push portable repository - if: steps.cutover.outputs.changed == 'true' + if: steps.portable.outputs.changed == 'true' run: | set -eu