Skip to content

Run Windows games on Apple Silicon — free, open source, with an open compatibility database that tells you what actually works.

release.sh pushes to origin's main by name, and the game smoke counts a crash dialog only when it comes from the environment under test. From a release worktree on its own branch, `git push origin HEAD` would have made a new branch of that name instead of updating main. A dry run showed it before 0.10.11, which went out through a copy with these pushes. Every push now names HEAD:refs/heads/main, after a check that HEAD contains origin/main. The game smoke failed The Sims on a Wine crash dialog from another session's environment while its three captures showed the game drawing, and the row passed on its own re-run. A dialog now counts when its WINEPREFIX is the row's environment or cannot be read

Gauthier Piarrettef842364782c1
diff --git a/Scripts/game-smoke.sh b/Scripts/game-smoke.sh
index caa7e6a..5deb140 100755
--- a/Scripts/game-smoke.sh
+++ b/Scripts/game-smoke.sh
@@ -94,7 +94,19 @@ for row in "${GAMES[@]}"; do
[ -n "$gw" ] && sips --cropOffset $((gy*2)) $((gx*2)) -c $((gh*2)) $((gw*2)) "$OUT/.fs.png" --out "$out" >/dev/null 2>&1
fi; }
sleep 40; h=(); for k in 1 2 3; do grab "$OUT/$name-$k.png"; h+=("$(md5 -q "$OUT/$name-$k.png" 2>/dev/null)"); sleep 10; done
- crash=$("$WINLIST" 2>/dev/null | grep -iE 'Program Error|Wine Debugger' | grep -c on=true)
+ # Only a crash dialog from this row's environment counts. Other sessions run Wine on this Mac
+ # too: on 2026-10-06 a dialog from another environment failed The Sims while its three
+ # captures showed the game drawing, and the row passed on its own re-run. The dialog's owner
+ # (winedbg, started in the crashing program's environment) carries WINEPREFIX; a dialog whose
+ # environment cannot be read still counts.
+ crash=0
+ for cpid in $("$WINLIST" 2>/dev/null | grep -iE 'Program Error|Wine Debugger' | grep on=true | grep -oE 'pid=[0-9]+' | cut -d= -f2); do
+ cenv=$(ps -E -p "$cpid" -o command= 2>/dev/null)
+ if [[ "$cenv" == *"WINEPREFIX="* && "$cenv" != *"WINEPREFIX=$H/bottles/$bottle "* && "$cenv" != *"WINEPREFIX=$H/bottles/$bottle" ]]; then
+ echo " (a crash dialog from another environment, pid $cpid, not counted)"; continue
+ fi
+ crash=$((crash + 1))
+ done
if [ "$crash" -gt 0 ]; then echo " FAIL: crash dialog"; results+=("{\"appid\":$appid,\"name\":\"$name\",\"result\":\"crash dialog\"}"); passed=false
elif [ "${h[1]}" = "${h[2]}" ] && [ "${h[2]}" = "${h[3]}" ]; then
# Identical captures also come from a still picture that is drawn every frame (The Last
diff --git a/Scripts/release.sh b/Scripts/release.sh
index 79343d8..072a114 100755
--- a/Scripts/release.sh
+++ b/Scripts/release.sh
@@ -5,9 +5,13 @@
# Scripts/release.sh --promote 0.3.1 (beta -> stable, phased over seven days)
set -euo pipefail
cd "$(dirname "$0")/.."
-# Every path below ends in a plain `git push` of the branch. On a detached HEAD that push fails
-# after the build and notarization have run (0.10.9, 2026-10-06), so say it before anything starts.
-git symbolic-ref -q HEAD >/dev/null || { echo "release.sh: HEAD is detached. Check out a branch that tracks origin/main first (in rel/gin-release: git checkout -B release-0.10.5 origin/main)" >&2; exit 1; }
+# Every push below names origin's main, where the appcast is served from. A plain `git push`
+# failed on a detached HEAD after the build and notarization had run (0.10.9), and `git push
+# origin HEAD` from a release worktree's own branch would have made a new branch of that name
+# instead of updating main (seen in a dry run before 0.10.11, 2026-10-06). The pushes are refused
+# when HEAD does not contain origin/main, so check that before anything starts.
+git fetch -q origin main || { echo "release.sh: cannot fetch origin main" >&2; exit 1; }
+git merge-base --is-ancestor origin/main HEAD || { echo "release.sh: HEAD does not contain origin/main. Rebase onto it and run Scripts/gate.sh again" >&2; exit 1; }
# Channels (2026-09-07): a normal release goes to beta first (`--beta`), then `--promote <version>`
# turns the same signed artifact into a stable, phased rollout by editing the appcast: no rebuild,
# so what testers ran is byte for byte what everyone gets. `--hotfix` is stable at once, no phasing.
@@ -50,7 +54,7 @@ xml.dom.minidom.parse('appcast.xml')
print(f'appcast: {v} promoted to stable, phased over seven days from now')
PY
gh release edit "v$PV" --prerelease=false --latest --title "Highball $PV"
- git add appcast.xml && git commit -m "release: promote v$PV to stable" && git push
+ git add appcast.xml && git commit -m "release: promote v$PV to stable" && git push origin "HEAD:refs/heads/main"
echo "promoted v$PV"
exit 0 ;;
esac
@@ -208,7 +212,7 @@ xcrun stapler staple "$DMG"
# without an existing tag, gh tags the REMOTE default-branch head, which mislabeled
# v0.7.8 (local fix commits weren't pushed yet, so the tag landed on the v0.7.7 commit).
git tag "v$VERSION"
-git push origin HEAD "v$VERSION"
+git push origin "HEAD:refs/heads/main" "v$VERSION"
# Publishing is one GitHub call that can fail on a network blip after the tag is already pushed
# (0.8.2: a read error on the final PATCH left a tag with no release and no appcast). Retry, and if
@@ -235,7 +239,7 @@ done
# The assets exist only once the release is published; do not point the appcast at them before.
gh release view "v$VERSION" --json isDraft --jq '.isDraft' | grep -q false
-git add appcast.xml && git commit -m "release: v$VERSION appcast" && git push
+git add appcast.xml && git commit -m "release: v$VERSION appcast" && git push origin "HEAD:refs/heads/main"
# GitHub's asset CDN lags the upload by a few seconds: wait until the zip downloads at full size.
for i in $(seq 1 24); do