ci: pick the runner image per Xcode line, commit results directly

The matrix reads the macos-26, macos-15 and macos-14 image readmes and
sends each Xcode line to the newest image that ships it, including beta
lines a runner already has. The collect job commits result files to the
default branch instead of opening a pull request.

Author: rigor789

.github/workflows/compat-check.yml

@@ -86,7 +86,8 @@ jobs:
     name: iOS ${{ matrix.runtime }} · Xcode ${{ matrix.xcode }} · CLI ${{ matrix.cli }} · Node ${{ matrix.node }}
     needs: matrix
     if: needs.matrix.outputs.has_ios == 'true'
-    runs-on: macos-15
+    # Chosen per Xcode line by the matrix job from the runner images' readmes.
+    runs-on: ${{ matrix.runner }}
     strategy:
       fail-fast: false
       matrix:
@@ -100,7 +101,7 @@ jobs:
         run: |
           app=$(ls -d /Applications/Xcode_${{ matrix.xcode }}*.app 2>/dev/null | sort -V | tail -1)
           if [ -z "$app" ]; then
-            echo "::warning::Xcode ${{ matrix.xcode }} is not installed on this runner image"
+            echo "::warning::Xcode ${{ matrix.xcode }} is not installed on ${{ matrix.runner }}"
             exit 1
           fi
           sudo xcode-select -s "$app/Contents/Developer"
@@ -179,49 +180,39 @@ jobs:
           path: data/verified/
 
   collect:
-    name: Merge results
+    name: Record results
     needs: [matrix, ios, android]
-    # Runs even when some builds failed: every success is a verified cell.
+    # Runs even when some builds failed: every outcome is a recorded cell.
     if: always() && needs.matrix.result == 'success'
     runs-on: ubuntu-latest
     permissions:
       contents: write
-      pull-requests: write
     steps:
-      # Base the results branch on the current default branch, not the commit
-      # this run started from, so the PR can only ever add result files.
       - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.repository.default_branch }}
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
-      # Each artifact is a data/verified/ tree holding only that job's new
-      # files, so dropping them all onto the checkout is the whole merge.
+      # Each artifact is a data/verified/ tree holding that job's result file,
+      # so dropping them all onto the checkout is the whole merge.
       - uses: actions/download-artifact@v4
         with:
           pattern: result-*
           path: data/verified
           merge-multiple: true
-      - id: merge
+      - name: Commit results
         run: |
-          git add -N data/verified
-          if git diff --quiet data/verified; then
+          git add data/verified
+          if git diff --cached --quiet; then
             echo "no new results"
-            echo "changed=false" >> "$GITHUB_OUTPUT"
-          else
-            git diff --stat data/verified
-            echo "changed=true" >> "$GITHUB_OUTPUT"
+            exit 0
           fi
-      - uses: peter-evans/create-pull-request@v7
-        if: steps.merge.outputs.changed == 'true'
-        with:
-          branch: ci/verified-results
-          title: "data: new compatibility results"
-          commit-message: "data: record compatibility results"
-          body: |
-            Successful builds from the compat-check run
-            ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}.
-            Merging redeploys the site with these cells marked as verified by CI.
-          add-paths: data/verified
-          delete-branch: true
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          count=$(git diff --cached --name-only | wc -l | tr -d ' ')
+          git commit -m "data: record $count compatibility results" \
+            -m "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          # Another run or a maintainer may have pushed meanwhile; results only add files, so a rebase never conflicts.
+          for attempt in 1 2 3; do
+            git push && exit 0
+            git pull --rebase
+          done
+          exit 1

README.md

@@ -29,8 +29,8 @@ as a browser-support-style matrix (Vue + Vite) for people.
 
 1. **Matrix**: `scripts/build-matrix.mjs` pulls the newest CLI and runtime
    releases from npm, Node.js majors from nodejs.org, Xcode lines from
-   xcodereleases.com (intersected with what the GitHub macOS runner image
-   ships), Android API levels from the SDK repository and JDK LTS releases
+   xcodereleases.com (each mapped to the newest GitHub macOS runner image
+   that ships it, including beta lines a runner already has), Android API levels from the SDK repository and JDK LTS releases
    from Adoptium, forms every pinned combination, and drops the ones that
    already have a file under `data/verified/`. The first run is large (GitHub
    allows 256 jobs per matrix; the rest wait for the next run); afterwards a
@@ -42,9 +42,9 @@ as a browser-support-style matrix (Vue + Vite) for people.
    passed or failed. A success proves the runtime's toolchain cells and the
    CLI's Node.js cell; a failure marks the toolchain cells unsupported. Either
    way the combination is never rebuilt.
-3. **Collect**: the artifacts are dropped onto the checkout and proposed as a
-   pull request that only adds files. Merging it redeploys the site with those
-   cells marked as verified by CI.
+3. **Collect**: the artifacts are dropped onto the checkout and committed to
+   the default branch. Every file names the run that produced it, so the
+   commit is the audit trail; nothing needs a manual merge.
 
 Running the workflow by hand with its inputs filled in verifies one specific
 combination instead of the feed-driven set; `force` rebuilds a combination

scripts/build-matrix.mjs

@@ -20,7 +20,9 @@ const XCODE_FEED = "https://xcodereleases.com/data.json";
 const NODE_FEED = "https://nodejs.org/dist/index.json";
 const ANDROID_REPOSITORY = "https://dl.google.com/android/repository/repository2-3.xml";
 const ADOPTIUM_RELEASES = "https://api.adoptium.net/v3/info/available_releases";
-const MACOS_RUNNER_README = "https://raw.githubusercontent.com/actions/runner-images/main/images/macos/macos-15-Readme.md";
+// Newest image first: an Xcode line shipped by several images runs on the newest one.
+const MACOS_RUNNERS = ["macos-26", "macos-15", "macos-14"];
+const RUNNER_README = (image) => `https://raw.githubusercontent.com/actions/runner-images/main/images/macos/${image}-Readme.md`;
 
 const CLI_VERSIONS = 2; // newest stable CLI releases
 const RUNTIME_VERSIONS = 2; // newest stable releases of each runtime
@@ -91,16 +93,24 @@ async function xcodeLines() {
 	return [...lines].sort(compareVersions).slice(0, XCODE_LINES);
 }
 
-// Xcode versions installed on the GitHub macOS runner image, from its published readme.
+// Which GitHub macOS runner image ships each Xcode line, from the images' published readmes.
 async function runnerXcodes() {
-	try {
-		const readme = await text(MACOS_RUNNER_README);
-		const section = readme.split(/^#+ .*Xcode.*$/m)[1] ?? readme;
-		return [...section.matchAll(/^\|\s*(\d+\.\d+(?:\.\d+)?)/gm)].map((m) => m[1]);
-	} catch (err) {
-		console.warn(`runner image readme unavailable (${err.message}); every Xcode line will be attempted`);
-		return null;
+	const byLine = new Map();
+	for (const image of MACOS_RUNNERS) {
+		try {
+			const readme = await text(RUNNER_README(image));
+			const section = readme.split(/^#+ .*Xcode.*$/m)[1] ?? readme;
+			for (const [, version] of section.matchAll(/^\|\s*(\d+\.\d+(?:\.\d+)?)/gm)) {
+				const line = version.split(".").slice(0, 2).join(".");
+				if (!byLine.has(line)) {
+					byLine.set(line, image);
+				}
+			}
+		} catch (err) {
+			console.warn(`${image} readme unavailable (${err.message})`);
+		}
 	}
+	return byLine;
 }
 
 // The SDK repository is the only source of installable package ids: newer API
@@ -183,7 +193,12 @@ async function manualMatrix(env) {
 	const matrix = { ios: [], android: [], deferred: { ios: 0, android: 0 }, manual: true };
 
 	if (platform === "ios") {
-		const job = { ...base, xcode: required("MANUAL_XCODE") };
+		const xcode = required("MANUAL_XCODE");
+		const runners = await runnerXcodes();
+		if (!runners.has(xcode)) {
+			throw new Error(`no GitHub macOS runner image ships Xcode ${xcode} (known: ${[...runners.keys()].join(", ")})`);
+		}
+		const job = { ...base, xcode, runner: runners.get(xcode) };
 		const result = { package: "@nativescript/ios", version: job.runtime, toolchains: { xcode: job.xcode }, with: { nativescript: job.cli, node: job.node } };
 		if (force || !isRecorded(result)) {
 			matrix.ios.push(job);
@@ -230,17 +245,20 @@ const [clis, nodes, iosRuntimes, androidRuntimes, xcodes, installedXcodes, level
 	jdkReleases(),
 ]);
 
+// Lines a runner ships that are newer than the newest stable feed line are
+// betas; they join the matrix so a new Xcode is exercised before it ships.
+const newestStable = xcodes[0];
+const betaLines = [...installedXcodes.keys()].filter((line) => compareVersions(line, newestStable) < 0);
+const xcodeLinesToTest = [...new Set([...betaLines, ...xcodes])].filter((line) => installedXcodes.has(line));
+
 const ios = [];
 for (const cli of clis) {
 	for (const node of nodes) {
 		for (const runtime of iosRuntimes) {
-			for (const xcode of xcodes) {
-				if (installedXcodes && !installedXcodes.some((v) => sameLine(v, xcode))) {
-					continue;
-				}
+			for (const xcode of xcodeLinesToTest) {
 				const result = { package: "@nativescript/ios", version: runtime, toolchains: { xcode }, with: { nativescript: cli, node } };
 				if (!isRecorded(result)) {
-					ios.push({ cli, node, runtime, xcode });
+					ios.push({ cli, node, runtime, xcode, runner: installedXcodes.get(xcode) });
 				}
 			}
 		}
@@ -273,7 +291,7 @@ const matrix = {
 	ios: ios.slice(0, MAX_JOBS_PER_MATRIX),
 	android: android.slice(0, MAX_JOBS_PER_MATRIX),
 	deferred: { ios: Math.max(0, ios.length - MAX_JOBS_PER_MATRIX), android: Math.max(0, android.length - MAX_JOBS_PER_MATRIX) },
-	feeds: { clis, nodes, iosRuntimes, androidRuntimes, xcodes, installedXcodes, levels, jdks },
+	feeds: { clis, nodes, iosRuntimes, androidRuntimes, xcodes, runners: Object.fromEntries(installedXcodes), levels, jdks },
 };
 
 emit(matrix);