Free fork of NotProton: Windows Steam games in Mac Steam, on CodeWeavers' Wine and Apple's Game Porting Toolkit
Swift apple-silicond3dmetaldxmtdxvkgame-porting-toolkitgptkmac-gamingmacosmetalfxrosetta-2steamsteam-playwinewinecx
build: one ci-checks list for CI and build-local, mincheck at macOS 26
raymondchinsb0bd8f18bbb9
diff --git a/.github/workflows/app.yml b/.github/workflows/app.ymlindex 4638bf8..98c7522 100644--- a/.github/workflows/app.yml+++ b/.github/workflows/app.yml@@ -102,43 +102,9 @@ jobs:- name: Build the apprun: make app- - name: Check the minimum macOS version- run: make -s mincheck-- - name: Check the translations- run: make -s l10ncheck-- - name: Run the hermetic C suites- run: |- make -s sigcheck- make -s callscheck- make -s webpatch-fixtures- make -s peicon-fixtures- make -s panel-behavior- make -s spawn-env- make -s activatecheck- make -s compatcheck- make -s compatsvc-check- make -s shortcutcheck- make -s launch-shell- make -s envcheck- make -s buildcheck- make -s settingscheck- make -s routecheck- make -s bridgecheck- make -s gamedrivecheck- make -s launchercheck- make -s seedcheck- make -s gamefixescheck-- - name: Run the Swift tests- run: make -s app-tests-- - name: Check game identity and controller transports without hardware- run: |- make game-host-check- make dualsense-check- make steam-rumble-check+ # The one check list, shared with scripts/build-local.sh --checks+ - name: Run the checks+ run: make ci-checks- name: Package the app bundlerun: |diff --git a/Makefile b/Makefileindex 9adc04e..ca13e36 100644--- a/Makefile+++ b/Makefile@@ -1,6 +1,9 @@CC := clangARCH := arm64MIN_VER := 15.0+# The oldest macOS the product supports. mincheck holds every binary in the bundle+# to it, MIN_VER above is only what the dylib and helpers are compiled for.+MINCHECK_VER := 26.0GLASS_SDK := 26.0AVAIL := -Werror=unguarded-availability-new@@ -141,7 +144,7 @@ launchercheck:.PHONY: mincheckmincheck:- @sh dylib/tests/mincheck.sh "$(APP_BUNDLE)" "$(MIN_VER)" "$(GLASS_SDK)"+ @sh dylib/tests/mincheck.sh "$(APP_BUNDLE)" "$(MINCHECK_VER)" "$(GLASS_SDK)".PHONY: l10ncheckl10ncheck:@@ -828,3 +831,29 @@ $(NP_NATIVE): $(NP_NATIVE_SRC)np-native-tests: $(NP_NATIVE)@if [ ! -f native-launch/tests/run.sh ]; then $(call SKIP,np-native-tests,native-launch/tests/run.sh); exit 0; fi; \sh native-launch/tests/run.sh $(NP_NATIVE)++.PHONY: native-shim-tests+native-shim-tests:+ @if [ ! -f native-shim/tests/run.sh ]; then $(call SKIP,native-shim-tests,native-shim/tests/run.sh); exit 0; fi; \+ sh native-shim/tests/run.sh++# Every check .github/workflows/app.yml runs, in its order, after `make app`.+# scripts/build-local.sh --checks runs this same target, so a local release build+# and CI gate on one list. Each check runs even when an earlier one failed.+# overlay-shim-tests is left out: it needs a Metal GPU and real frame timing.+CI_CHECKS := mincheck l10ncheck \+ sigcheck callscheck webpatch-fixtures peicon-fixtures panel-behavior spawn-env \+ activatecheck compatcheck compatsvc-check shortcutcheck launch-shell envcheck \+ buildcheck settingscheck routecheck bridgecheck gamedrivecheck launchercheck \+ seedcheck gamefixescheck padcheck np-native-tests native-shim-tests \+ app-tests game-host-check dualsense-check steam-rumble-check++.PHONY: ci-checks+ci-checks:+ @failed=""; \+ for t in $(CI_CHECKS); do \+ echo "==> [check] make -s $$t"; \+ $(MAKE) -s $$t || failed="$$failed $$t"; \+ done; \+ if [ -n "$$failed" ]; then echo "==> ci-checks failed:$$failed" >&2; exit 1; fi; \+ echo "==> ci-checks: all $(words $(CI_CHECKS)) checks passed"diff --git a/scripts/build-local.sh b/scripts/build-local.shindex cc3b3de..ca4a017 100755--- a/scripts/build-local.sh+++ b/scripts/build-local.sh@@ -226,18 +226,14 @@ if [ "$run_checks" -eq 1 ]; thencheck_log=$LOG_DIR/checks.log: >"$check_log"start=$(date +%s)- for target in sigcheck callscheck webpatch-fixtures peicon-fixtures panel-behavior \- spawn-env compatcheck compatsvc-check launch-shell envcheck buildcheck \- settingscheck routecheck bridgecheck gamedrivecheck seedcheck padcheck np-native-tests app-tests; do- echo "==> [check] make -s $target" | tee -a "$check_log"- [ "$target" != app-tests ] || link_test_sparkle >>"$check_log" 2>&1 || true- if make -s "$target" >>"$check_log" 2>&1; then- tail -n 1 "$check_log" | sed 's/^/ /'- else- echo " FAILED, see $check_log" >&2- check_failures="$check_failures $target"- fi- done+ link_test_sparkle >>"$check_log" 2>&1 || true+ # make ci-checks is the list app.yml runs; each check runs even after a failure+ echo "==> [check] make ci-checks, log: $check_log"+ if ! make ci-checks >>"$check_log" 2>&1; then+ check_failures=$(sed -n 's/^==> ci-checks failed://p' "$check_log")+ [ -n "$check_failures" ] || check_failures=" ci-checks"+ fi+ grep '^==> ' "$check_log" | sed 's/^/ /'timings="$timingschecks $(($(date +%s) - start))"fi