unity-cli@v4.0.0

.github/actions/run-unity-test-batch/action.yml

@@ -29,10 +29,14 @@ runs:
     - name: Prepare test list and install packages
       shell: bash
       working-directory: ${{ inputs.unity-project-path }}
+      # inputs reach the script through the environment, never by expression interpolation
+      env:
+        TESTS_INPUT_OVERRIDE: ${{ inputs.tests-input }}
+        TEST_PROFILE: ${{ inputs.test-profile }}
       run: |
         set -euo pipefail
-        tests_input="${{ inputs.tests-input }}"
-        test_profile="${{ inputs.test-profile }}"
+        tests_input="${TESTS_INPUT_OVERRIDE}"
+        test_profile="${TEST_PROFILE}"
 
         if [ -z "$tests_input" ]; then
           case "$test_profile" in
@@ -60,7 +64,8 @@ runs:
           needs_test_framework=true
         fi
 
-        npm install -g openupm-cli
+        # the CLI is pinned; the packages it adds stay on their latest releases on purpose (see docs/unity-version-support.md)
+        npm install -g openupm-cli@4.5.2
         openupm add com.utilities.buildpipeline
         if [ "$needs_test_framework" = true ]; then
           openupm add com.unity.test-framework

.github/scripts/unity-release-discovery.cjs

@@ -1,17 +1,14 @@
 /**
- * Weekly Unity release discovery: compare Releases API tips to CI matrix + canary pin.
+ * Weekly Unity release discovery: compare Releases API tips to the CI matrix.
  * Usage: node .github/scripts/unity-release-discovery.cjs
- * Env: GITHUB_STEP_SUMMARY (optional), OPEN_ISSUE=1 + GH_TOKEN/GITHUB_TOKEN to open/update drift issue.
+ * Env: GITHUB_STEP_SUMMARY (optional): the report is appended to the run summary, and drift is a warning annotation.
  */
 const fs = require('fs');
 const path = require('path');
-const { execFileSync } = require('child_process');
 
 const repoRoot = path.join(__dirname, '..', '..');
 const apiBase = 'https://services.api.unity.com/unity/editor/release/v1/releases';
-const minors = ['6000.0', '6000.1', '6000.2', '6000.3', '6000.4', '6000.5', '6000.6', '6000.7'];
-const ISSUE_TITLE = 'unity-release-drift: matrix / canary vs Unity Releases API';
-const ISSUE_LABEL = 'unity-release-drift';
+const minors = ['6000.0', '6000.1', '6000.2', '6000.3', '6000.4', '6000.5', '6000.6', '6000.7', '6000.8', '7000.0', '7000.1'];
 
 async function fetchLatest(versionPrefix) {
     const url = `${apiBase}?version=${encodeURIComponent(versionPrefix)}&limit=10`;
@@ -21,12 +18,24 @@ async function fetchLatest(versionPrefix) {
     }
     const data = await res.json();
     const results = Array.isArray(data.results) ? data.results : [];
-    return results.map(r => ({
-        version: r.version,
-        stream: r.stream,
-        shortRevision: r.shortRevision,
-        releaseDate: r.releaseDate,
-    }));
+    // the report is markdown in the run summary, so only fields rebuilt from validated parts reach it
+    return results.map(normalizeRelease).filter(Boolean);
+}
+
+const STREAMS = { LTS: 'LTS', SUPPORTED: 'SUPPORTED', TECH: 'TECH', BETA: 'BETA', ALPHA: 'ALPHA' };
+const CHANNELS = { a: 'a', b: 'b', c: 'c', f: 'f', p: 'p', x: 'x' };
+
+function normalizeRelease(r) {
+    const version = /^(\d{1,4})\.(\d{1,3})\.(\d{1,3})([abcfpx])(\d{1,3})$/.exec(String(r?.version ?? ''));
+    const revision = /^[0-9a-f]{12}$/.exec(String(r?.shortRevision ?? ''));
+    const stream = STREAMS[String(r?.stream ?? '').toUpperCase()] ?? 'OTHER';
+    if (!version) return null;
+    const [, major, minor, patch, channel, build] = version;
+    return {
+        version: `${Number(major)}.${Number(minor)}.${Number(patch)}${CHANNELS[channel]}${Number(build)}`,
+        stream,
+        shortRevision: revision ? revision[0] : '',
+    };
 }
 
 function loadMatrixVersions() {
@@ -36,17 +45,6 @@ function loadMatrixVersions() {
     return buildOptions['unity-version'] || [];
 }
 
-function loadCanaryPin() {
-    const yml = fs.readFileSync(
-        path.join(repoRoot, '.github', 'workflows', 'unity-preview-canary.yml'),
-        'utf8'
-    );
-    const version = (yml.match(/"unity-version":\s*"([^"]+)"/) || [])[1];
-    const changeset = (yml.match(/"changeset":\s*"([^"]+)"/) || [])[1];
-    const channel = (yml.match(/"channel":\s*"([^"]+)"/) || [])[1];
-    return { version, changeset, channel };
-}
-
 function pickTip(rows, preferStreams) {
     for (const stream of preferStreams) {
         const hit = rows.find(r => String(r.stream).toUpperCase() === stream);
@@ -57,12 +55,12 @@ function pickTip(rows, preferStreams) {
 
 async function main() {
     const matrixVersions = loadMatrixVersions();
-    const canary = loadCanaryPin();
     const tips = [];
 
     for (const minor of minors) {
         try {
             const rows = await fetchLatest(minor);
+            if (rows.length === 0) continue; // the stream has no release yet
             const tip = pickTip(rows, ['LTS', 'SUPPORTED', 'BETA', 'ALPHA']);
             tips.push({ minor, tip, count: rows.length });
         } catch (err) {
@@ -79,19 +77,13 @@ async function main() {
         lines.push(`- \`${v}\``);
     }
     lines.push('');
-    lines.push('### Preview canary pin');
-    lines.push('');
-    lines.push(`- version: \`${canary.version || 'n/a'}\``);
-    lines.push(`- changeset: \`${canary.changeset || 'n/a'}\``);
-    lines.push(`- channel: \`${canary.channel || 'n/a'}\``);
-    lines.push('');
     lines.push('### API tips by minor');
     lines.push('');
     lines.push('| Minor | Tip version | Stream | Changeset |');
     lines.push('|-------|-------------|--------|-----------|');
     for (const row of tips) {
         if (!row.tip) {
-            lines.push(`| ${row.minor} | _(error)_ | | ${row.error || ''} |`);
+            lines.push(`| ${row.minor} | _(error)_ | | |`);
             continue;
         }
         lines.push(
@@ -101,16 +93,10 @@ async function main() {
     lines.push('');
 
     const drifts = [];
-    const tip60006 = tips.find(t => t.minor === '6000.6')?.tip;
-    if (tip60006 && canary.version && tip60006.version !== canary.version) {
-        drifts.push(
-            `Canary pin ${canary.version} is behind API tip ${tip60006.version} (${tip60006.stream}, ${tip60006.shortRevision}).`
-        );
-    }
+    // every stream is tracked, alphas and betas included: the matrix resolves each row to the newest build of its stream
     for (const row of tips) {
         if (!row.tip) continue;
         const stream = String(row.tip.stream || '').toUpperCase();
-        if (stream !== 'LTS' && stream !== 'SUPPORTED') continue;
         const minorKey = row.minor; // e.g. 6000.5
         const covered = matrixVersions.some(v => {
             if (v === minorKey) return true;
@@ -130,7 +116,7 @@ async function main() {
     if (drifts.length === 0) {
         lines.push('### Drift');
         lines.push('');
-        lines.push('No matrix/canary drift detected against API tips.');
+        lines.push('No matrix drift detected against API tips.');
     } else {
         lines.push('### Drift');
         lines.push('');
@@ -142,89 +128,13 @@ async function main() {
     const body = lines.join('\n');
     console.log(body);
 
-    // Step summary: local matrix/canary + drift count only (no HTTP-tainted API tip fields).
-    if (process.env.GITHUB_STEP_SUMMARY) {
-        const summaryPath = path.resolve(process.env.GITHUB_STEP_SUMMARY);
-        const runnerTemp = process.env.RUNNER_TEMP ? path.resolve(process.env.RUNNER_TEMP) : '';
-        const underTemp =
-            runnerTemp &&
-            (summaryPath === runnerTemp || summaryPath.startsWith(runnerTemp + path.sep));
-        if (underTemp || process.env.GITHUB_ACTIONS === 'true') {
-            const localSummary = [
-                '## Unity release discovery',
-                '',
-                '### Blocking matrix (`build-options.json`)',
-                '',
-                ...matrixVersions.map(v => `- \`${v}\``),
-                '',
-                '### Preview canary pin',
-                '',
-                `- version: \`${canary.version || 'n/a'}\``,
-                `- changeset: \`${canary.changeset || 'n/a'}\``,
-                `- channel: \`${canary.channel || 'n/a'}\``,
-                '',
-                '### Drift',
-                '',
-                drifts.length === 0
-                    ? 'No matrix/canary drift detected against API tips.'
-                    : `${drifts.length} drift item(s) detected. See the job log for API tip details.`,
-                '',
-            ].join('\n');
-            fs.appendFileSync(summaryPath, localSummary);
-        }
+    // drift shows as a warning on the run; the report itself only goes to the run summary
+    for (const d of drifts) {
+        console.log(`::warning title=Unity release drift::${d}`);
     }
 
-    if (process.env.OPEN_ISSUE === '1' && drifts.length > 0) {
-        const token = process.env.GH_TOKEN || process.env.GITHUB_TOKEN;
-        if (!token) {
-            console.error('OPEN_ISSUE=1 but no GH_TOKEN/GITHUB_TOKEN');
-            process.exitCode = 1;
-            return;
-        }
-        try {
-            const existing = execFileSync(
-                'gh',
-                ['issue', 'list', '--label', ISSUE_LABEL, '--state', 'open', '--json', 'number,title', '--limit', '5'],
-                { encoding: 'utf8' }
-            );
-            const issues = JSON.parse(existing || '[]');
-            const hit = issues.find(i => i.title === ISSUE_TITLE);
-            const issueBody = [
-                'Automated drift report from `unity-release-discovery`.',
-                '',
-                ...drifts.map(d => `- ${d}`),
-                '',
-                body,
-            ].join('\n');
-            try {
-                execFileSync('gh', ['label', 'create', ISSUE_LABEL, '--force'], { stdio: 'ignore' });
-            } catch {
-                // label may already exist or lack permission; issue create can omit it
-            }
-            if (hit) {
-                execFileSync('gh', ['issue', 'comment', String(hit.number), '--body', issueBody], {
-                    stdio: 'inherit',
-                });
-                console.log(`Updated issue #${hit.number}`);
-            } else {
-                try {
-                    execFileSync(
-                        'gh',
-                        ['issue', 'create', '--title', ISSUE_TITLE, '--label', ISSUE_LABEL, '--body', issueBody],
-                        { stdio: 'inherit' }
-                    );
-                } catch {
-                    execFileSync(
-                        'gh',
-                        ['issue', 'create', '--title', ISSUE_TITLE, '--body', issueBody],
-                        { stdio: 'inherit' }
-                    );
-                }
-            }
-        } catch (err) {
-            console.error(`Issue upsert failed: ${err.message || err}`);
-            process.exitCode = 1;
-        }
+    if (process.env.GITHUB_STEP_SUMMARY) {
+        fs.appendFileSync(path.resolve(process.env.GITHUB_STEP_SUMMARY), `${body}\n`);
     }
 }
 

.github/workflows/build-options-legacy.json

@@ -0,0 +1,77 @@
+{
+  "os": [
+    "ubuntu-latest",
+    "windows-latest",
+    "macos-latest"
+  ],
+  "unity-version": [
+    "4.7.2",
+    "5.6.7f1 (e80cc3114ac1)",
+    "2017.4.40f1",
+    "2018",
+    "2019.x",
+    "2020.*",
+    "2021.3.x",
+    "2022.3.*"
+  ],
+  "include": [
+    {
+      "os": "ubuntu-latest",
+      "build-target": "StandaloneLinux64"
+    },
+    {
+      "os": "ubuntu-latest",
+      "build-target": "WebGL",
+      "build-args": "-colorSpace Gamma"
+    },
+    {
+      "os": "ubuntu-latest",
+      "build-target": "Android"
+    },
+    {
+      "os": "windows-latest",
+      "build-target": "StandaloneWindows64"
+    },
+    {
+      "os": "windows-latest",
+      "build-target": "Android"
+    },
+    {
+      "os": "macos-latest",
+      "build-target": "StandaloneOSX"
+    },
+    {
+      "os": "macos-latest",
+      "build-target": "iOS"
+    }
+  ],
+  "exclude": [
+    {
+      "os": "ubuntu-latest",
+      "unity-version": "4.7.2"
+    },
+    {
+      "os": "macos-latest",
+      "unity-version": "4.7.2"
+    },
+    {
+      "os": "windows-latest",
+      "build-target": "Android",
+      "unity-version": "4.7.2"
+    },
+    {
+      "os": "ubuntu-latest",
+      "unity-version": "5.6.7f1 (e80cc3114ac1)"
+    },
+    {
+      "os": "macos-latest",
+      "build-target": "iOS",
+      "unity-version": "5.6.7f1 (e80cc3114ac1)"
+    },
+    {
+      "os": "windows-latest",
+      "build-target": "Android",
+      "unity-version": "5.6.7f1 (e80cc3114ac1)"
+    }
+  ]
+}

.github/workflows/build-options.json

@@ -5,20 +5,15 @@
     "macos-latest"
   ],
   "unity-version": [
-    "4.7.2",
-    "5.6.7f1 (e80cc3114ac1)",
-    "2017.4.40f1",
-    "2018",
-    "2019.x",
-    "2020.*",
-    "2021.3.x",
-    "2022.3.*",
     "6000.0.x",
     "6000.1.*",
     "6000.2",
     "6000.3",
     "6000.4",
-    "6000.5"
+    "6000.5",
+    "6000.6",
+    "6000.7",
+    "7000.0"
   ],
   "include": [
     {
@@ -66,34 +61,5 @@
       "os": "macos-latest",
       "build-target": "iOS"
     }
-  ],
-  "exclude": [
-    {
-      "os": "ubuntu-latest",
-      "unity-version": "4.7.2"
-    },
-    {
-      "os": "macos-latest",
-      "unity-version": "4.7.2"
-    },
-    {
-      "os": "windows-latest",
-      "build-target": "Android",
-      "unity-version": "4.7.2"
-    },
-    {
-      "os": "ubuntu-latest",
-      "unity-version": "5.6.7f1 (e80cc3114ac1)"
-    },
-    {
-      "os": "macos-latest",
-      "build-target": "iOS",
-      "unity-version": "5.6.7f1 (e80cc3114ac1)"
-    },
-    {
-      "os": "windows-latest",
-      "build-target": "Android",
-      "unity-version": "5.6.7f1 (e80cc3114ac1)"
-    }
   ]
-}
+}