Skip to content

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

Merge remote-tracking branch 'origin/main' into feat/beta-stamping

Raystorms1fe6fb46af76
diff --cc Makefile
index ce2918a,2ce5c73..98717a7
--- a/Makefile
+++ b/Makefile
@@@ -908,8 -901,8 +912,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 cicheck padcheck compat-reported-check np-native-tests native-shim-tests \
+ seedcheck gamefixescheck versioncheck 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.
diff --cc docs/RELEASING.md
index 4614876,c565475..e7be5a0
--- a/docs/RELEASING.md
+++ b/docs/RELEASING.md
@@@ -93,10 -54,10 +96,11 @@@ its version check stops it. `make versi
scripts/bump-version.sh patch # or minor / major
git commit -m "chore(release): Bridgeplay X.Y.Z" dylib/version.h
```
- `scripts/sync-upstream.sh` already bumps the patch after an upstream merge.
+ `scripts/sync-upstream.sh` already bumps the patch after an upstream merge on `main`; on `beta` it
+ commits no bump, see Betas.
2. Push to `main` of `raymondchins/Bridgeplay` (the script refuses anything else).
- 3. Optionally rehearse: `scripts/release-local.sh --dry-run` writes the zip and appcast to
+ 3. Optionally rehearse: `scripts/release-local.sh --dry-run` writes the zip, appcast and
+ an ad hoc native installer ZIP to
`out/release/` from an app already built with `make app`, without publishing or reading
the keychain.
4. Release: `scripts/release-local.sh` (notes default to the commit subjects since the
diff --cc dylib/version.h
index a99ff7d,4d8d590..951af04
--- a/dylib/version.h
+++ b/dylib/version.h
@@@ -10,11 -10,8 +10,11 @@@
// (CFBundleShortVersionString, sparkle:shortVersionString)
// BRIDGEPLAY_BUILD +1 on every release, continuing the old "-ray.N" counter; Sparkle
// orders updates by it (CFBundleVersion, sparkle:version)
+// Both are committed as they are for a stable release: a plain X.Y.Z and the next build. A beta
+// build stamps its X.Y.Z-beta.N label, build number and channel in at build time
+// (scripts/stamp-beta.sh); those are never committed.
// Change both with scripts/bump-version.sh, see docs/RELEASING.md.
- #define BRIDGEPLAY_VERSION "0.7.0"
- #define BRIDGEPLAY_BUILD 44
+ #define BRIDGEPLAY_VERSION "0.7.1"
+ #define BRIDGEPLAY_BUILD 45
#endif // NOTPROTON_VERSION_H