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

build: always attempt portable merge

Browse Source
This commit is contained in:
Thomas Adam
2026-07-13 09:10:24 +01:00
parent 0ce72059e6
commit 8b2bc1a384
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,7 +137,7 @@ jobs:
git push origin master openbsd-git git push origin master openbsd-git
- name: Merge cutover into portable - name: Merge cutover into portable
if: steps.cutover.outputs.changed == 'true' id: portable
run: | run: |
set -eu set -eu
@@ -153,9 +153,14 @@ jobs:
git fetch --no-tags tmux-openbsd master:refs/remotes/tmux-openbsd/master git fetch --no-tags tmux-openbsd master:refs/remotes/tmux-openbsd/master
git switch master git switch master
git merge --no-ff --log refs/remotes/tmux-openbsd/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 - name: Push portable repository
if: steps.cutover.outputs.changed == 'true' if: steps.portable.outputs.changed == 'true'
run: | run: |
set -eu set -eu