Skip to content

Free fork of NotProton: Windows Steam games in Mac Steam, on CodeWeavers' Wine and Apple's Game Porting Toolkit

Merge branch 'prep/0.7.1'

raymondchins48225b812d35
diff --cc Makefile
index 84082ee,cdaa5a3..2ce5c73
--- a/Makefile
+++ b/Makefile
@@@ -897,8 -897,8 +901,8 @@@ 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 compat-reported-check np-native-tests native-shim-tests \
+ seedcheck gamefixescheck cicheck padcheck compat-reported-check np-native-tests native-shim-tests \
- app-tests game-host-check dualsense-check steam-rumble-check
+ app-tests native-installercheck game-host-check dualsense-check steam-rumble-check
# app.yml runs the checks that need the built app in its build job and the rest in a
# parallel job; both lists together are CI_CHECKS.
@@@ -933,10 -919,10 +937,18 @@@ ci-checks
if [ -n "$$failed" ]; then echo "==> ci-checks failed:$$failed" >&2; exit 1; fi; \
echo "==> ci-checks: all $(words $(CI_CHECKS)) checks passed"
+# One check for ci-checks: always succeeds, leaving the exit status and seconds in <check>.rc
+ci-run/%:
+ @start=$$(date +%s); rc=0; \
+ $(MAKE) -s $* >$(CHECK_LOGS)/$*.log 2>&1 </dev/null || rc=$$?; \
+ secs=$$(($$(date +%s) - start)); \
+ echo "$$rc $$secs" >$(CHECK_LOGS)/$*.rc; \
+ if [ $$rc -eq 0 ]; then echo "--> $* passed in $${secs}s"; else echo "--> $* FAILED in $${secs}s"; fi
++
+ .PHONY: native-installer native-installercheck
+ native-installer:
+ sh scripts/package-native-installer.sh
+
+ native-installercheck:
+ sh scripts/test-native-installer.sh
+ sh scripts/test-installer-cleanup.sh