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
ci: build betas from dev instead of beta
Raystorm4bca6cac327c
diff --git a/.github/workflows/app.yml b/.github/workflows/app.ymlindex 236ae44..00d1cac 100644--- a/.github/workflows/app.yml+++ b/.github/workflows/app.yml@@ -1,13 +1,13 @@name: app-# Starts on every PR and every push to main and beta, so the "app gate" job below always+# Starts on every PR and every push to main and dev, so the "app gate" job below always# reports: it is the check a branch rule can require. The scope job decides whether the# change is docs-only (.github/docs-only-paths); if so the build and checks jobs are# skipped and the gate passes. scripts/build-local.sh reuses a run for a release only when# those two jobs ran and succeeded (scripts/ci-run-passed.sh), so keep their names.on:push:- branches: [main, beta]+ branches: [main, dev]pull_request:workflow_dispatch:diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.ymlindex f52881d..bcf5d68 100644--- a/.github/workflows/lint.yml+++ b/.github/workflows/lint.yml@@ -2,7 +2,7 @@ name: linton:push:- branches: [main, beta]+ branches: [main, dev]pull_request:workflow_dispatch:diff --git a/docs/RELEASING.md b/docs/RELEASING.mdindex 2e89ed2..5064232 100644--- a/docs/RELEASING.md+++ b/docs/RELEASING.md@@ -44,8 +44,8 @@ a newer install and leaves it alone. `VersioningTests` guards both.## Betas-The committed `BRIDGEPLAY_VERSION` is always a plain `X.Y.Z`, on `main` and on `beta`, so merging-`main` into `beta` never conflicts over a version. A beta's label, build number and channel are+The committed `BRIDGEPLAY_VERSION` is always a plain `X.Y.Z`, on `main` and on `dev`, so merging+`main` into `dev` never conflicts over a version. A beta's label, build number and channel arestamped into the app at build time by `scripts/stamp-beta.sh` and never committed;`bump-version.sh`, `stamp-beta.sh` and `make app` refuse a beta label in `dylib/version.h`.@@ -77,8 +77,8 @@ scripts/bump-version.sh patch --named 0.7.3 --highest-build 47 # minor --name`--named` fails the bump when it would land anywhere else, and `BRIDGEPLAY_HIGHEST_BUILD` can stand infor `--highest-build`. Without it the bump only knows the committed build, so give it the real maximum.-Upstream merges go to `beta`: `scripts/sync-upstream.sh` merges and commits no version bump there-(`BRIDGEPLAY_BETA_BRANCH` names the branch, default `beta`). On `main`, the exception for a security or+Betas are built from `dev`, and upstream merges go there: `scripts/sync-upstream.sh` merges and+commits no version bump on it (`BRIDGEPLAY_BETA_BRANCH` names the branch, default `dev`). On `main`, the exception for a security orcrash hotfix from upstream, it still bumps the patch.`release-local.sh` does not publish betas: a stamped build no longer matches `dylib/version.h`, so@@ -99,7 +99,7 @@ its version check stops it. `make versioncheck` covers the stamp, the bump and t`set X.Y.Z` takes any version above the committed one, such as `0.7.31` after `0.7.3` for asmall follow-up. The numbers compare as integers, so `0.7.31` sorts above `0.7.4`: after it,go on with `0.7.32` (or `patch`) or a minor. Updates still order by the build, which goes up by one.- `scripts/sync-upstream.sh` already bumps the patch after an upstream merge on `main`; on `beta` it+ `scripts/sync-upstream.sh` already bumps the patch after an upstream merge on `main`; on `dev` itcommits 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, appcast anddiff --git a/dylib/tests/versioncheck.sh b/dylib/tests/versioncheck.shindex fe6b616..e2de061 100644--- a/dylib/tests/versioncheck.sh+++ b/dylib/tests/versioncheck.sh@@ -348,22 +348,22 @@ expect_eq "main build" 45 "$(version_in BRIDGEPLAY_BUILD)"expect_eq "main commits the bump" "chore(release): bump Bridgeplay to 0.7.3 after upstream merge" \"$(git_in "$wk" log -1 --format=%s)"-# On beta it merges and commits no version change.-sync_fixture onbeta+# On dev it merges and commits no version change.+sync_fixture ondevecho more >"$up/file.txt"git_in "$up" commit -q -am "upstream change"-git_in "$wk" checkout -q -B beta-expect_ok "sync on beta" sync_upstream x=1-expect_eq "beta version" 0.7.2 "$(version_in BRIDGEPLAY_VERSION)"-expect_eq "beta build" 44 "$(version_in BRIDGEPLAY_BUILD)"-expect_eq "beta merged upstream" more "$(cat "$wk/file.txt")"+git_in "$wk" checkout -q -B dev+expect_ok "sync on dev" sync_upstream x=1+expect_eq "dev version" 0.7.2 "$(version_in BRIDGEPLAY_VERSION)"+expect_eq "dev build" 44 "$(version_in BRIDGEPLAY_BUILD)"+expect_eq "dev merged upstream" more "$(cat "$wk/file.txt")"case $(git_in "$wk" log --format=%s) in- *chore\(release\)*) fail "a version bump was committed on beta" ;;+ *chore\(release\)*) fail "a version bump was committed on dev" ;;*) pass ;;esac-expect_eq "beta tree is clean" "" "$(git_in "$wk" status --porcelain --untracked-files=no)"+expect_eq "dev tree is clean" "" "$(git_in "$wk" status --porcelain --untracked-files=no)"-# The beta branch name can be changed; any other branch bumps as on main.+# The dev branch name can be changed; any other branch bumps as on main.sync_fixture namedecho more >"$up/file.txt"git_in "$up" commit -q -am "upstream change"@@ -378,7 +378,7 @@ expect_ok "sync on another branch" sync_upstream x=1expect_eq "other branch version" 0.7.3 "$(version_in BRIDGEPLAY_VERSION)"# A version.h conflict is still resolved: Bridgeplay's lines stay, NotProton takes upstream's.-for branch in main beta; do+for branch in main dev; dosync_fixture "conflict-$branch"sed 's/^#define NOTPROTON_VERSION ".*"$/#define NOTPROTON_VERSION "1.3.0"/' "$up/dylib/version.h" >"$up/version.h.new"cat "$up/version.h.new" >"$up/dylib/version.h"@@ -393,7 +393,7 @@ for branch in main beta; doexpect_eq "$branch upstream version" 1.3.0 "$(version_in NOTPROTON_VERSION)"doneexpect_eq "conflict on main bumps the patch" 0.7.3 "$(define "$work/conflict-main/dylib/version.h" BRIDGEPLAY_VERSION)"-expect_eq "conflict on beta keeps the version" 0.7.2 "$(define "$work/conflict-beta/dylib/version.h" BRIDGEPLAY_VERSION)"+expect_eq "conflict on dev keeps the version" 0.7.2 "$(define "$work/conflict-dev/dylib/version.h" BRIDGEPLAY_VERSION)"if [ "$failures" -ne 0 ]; thenecho "==> versioncheck: $failures of $checks checks failed" >&2diff --git a/scripts/build-local.sh b/scripts/build-local.shindex 4cce85f..cb8365e 100755--- a/scripts/build-local.sh+++ b/scripts/build-local.sh@@ -246,7 +246,7 @@ if [ "$run_checks" -eq 1 ] && [ -n "$fingerprint" ] && [ "${BRIDGEPLAY_FORCE_CHEchecks_reused=1fi-# The app workflow runs the same make ci-checks on every push to main and beta, so a release+# The app workflow runs the same make ci-checks on every push to main and dev, so a release# whose sources (version.h and docs aside) match a commit that workflow passed skips them# too: push, let CI pass, bump, release. Needs gh; without it, or with no passing run, the# checks run here. A docs-only run is green with its build and checks skipped, so a rundiff --git a/scripts/stamp-beta.sh b/scripts/stamp-beta.shindex b6a18e0..f7639d8 100755--- a/scripts/stamp-beta.sh+++ b/scripts/stamp-beta.sh@@ -4,7 +4,7 @@# BRIDGEPLAY_BETA=N BRIDGEPLAY_BETA_BUILD=B [BRIDGEPLAY_BETA_PLANNED=X.Y.Z] make app# scripts/stamp-beta.sh check | print | apply Info.plist#-# dylib/version.h always holds the plain X.Y.Z, on main and on beta. A beta build is named+# dylib/version.h always holds the plain X.Y.Z, on main and on dev. A beta build is named# after the release it leads to: label X.Y.Z-beta.N with X.Y.Z the planned release, which# defaults to the next patch of the committed version; name a milestone minor to override it.# It must be above the committed version. The build number B is "the highest build everdiff --git a/scripts/sync-upstream.sh b/scripts/sync-upstream.shindex 012a3a3..f00de46 100755--- a/scripts/sync-upstream.sh+++ b/scripts/sync-upstream.sh@@ -10,7 +10,7 @@# resolved automatically is dylib/version.h: Bridgeplay's lines are kept and# NOTPROTON_VERSION takes upstream's value. Any other conflict aborts that merge and# leaves the tree untouched. After a merge on main, scripts/bump-version.sh patch is committed;-# on beta (BRIDGEPLAY_BETA_BRANCH, default beta) no version change is committed.+# on dev (BRIDGEPLAY_BETA_BRANCH, default dev), where betas are built, nothing is bumped.set -eu@@ -88,11 +88,11 @@ for entry in $pending; doecho "==> kept Bridgeplay's version.h, NotProton $theirs"done-# On beta nothing is bumped: the committed version stays X.Y.Z there, and the stable that+# On dev nothing is bumped: the committed version stays X.Y.Z there, and the stable that# ships the beta takes the bump. On main (a security or crash hotfix from upstream) an upstream# merge is a patch: versions move slowly, see docs/RELEASING.md.branch=$(git symbolic-ref -q --short HEAD || true)-if [ "$branch" = "${BRIDGEPLAY_BETA_BRANCH:-beta}" ]; then+if [ "$branch" = "${BRIDGEPLAY_BETA_BRANCH:-dev}" ]; thenecho "==> on $branch: no version bump committed; the stable that ships this beta gets it"elif [ "$(product_of <dylib/version.h)" = "$ours_before" ]; thenscripts/bump-version.sh patchdiff --git a/scripts/tests/cicheck.sh b/scripts/tests/cicheck.shindex cb53f26..af703c1 100644--- a/scripts/tests/cicheck.sh+++ b/scripts/tests/cicheck.sh@@ -336,8 +336,8 @@ job() { awk -v j=" $1:" '$0 == j { p = 1; next } p && /^ [a-z_-]+:$/ { exit }has() { printf '%s\n' "$2" | grep -Fxq -- "$1"; }no "app.yml: no path filters" grep -Eq '^[[:space:]]*paths(-ignore)?:' "$app"-eq "app.yml: push branches" " branches: [main, beta]" "$(grep -E '^ branches:' "$app")"-eq "lint.yml: push branches" " branches: [main, beta]" "$(grep -E '^ branches:' "$lint")"+eq "app.yml: push branches" " branches: [main, dev]" "$(grep -E '^ branches:' "$app")"+eq "lint.yml: push branches" " branches: [main, dev]" "$(grep -E '^ branches:' "$lint")"yes "app.yml: runs on every pull request" grep -Fxq ' pull_request:' "$app"no "app.yml: pull requests not limited to a branch" awk '/^ pull_request:/ { p = 1; next } p && /^ branches/ { f = 1 } p && /^ [a-z_]+:/ { p = 0 } END { exit !f }' "$app"yes "lint.yml: runs on every pull request" grep -Fxq ' pull_request:' "$lint"