Merge branch 'main' into chore/remove-legacy-cli

chore: remove legacy CLI bootstrap and unused deps
Remove InitCliMode/RunCli, @CliFunction decorator, and CliFunctionsRepository. The only registered CLI mode was `print-input` which is unused — all real CLI functionality lives in the orchestrator repo now. This drops 3 dependencies: - commander-ts (decorator-based CLI, needed reflect-metadata) - reflect-metadata (peer dep of commander-ts) - commander (only used for OptionValues type) Cli.options, Cli.isCliMode, and Cli.query remain — the orchestrator plugin sets these directly without commander. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-05-31 22:06:16 -07:00 · 2026-05-06 22:30:57 +01:00 · 2026-05-06 22:29:43 +01:00 · 2026-05-06 22:01:22 +01:00 · 2026-05-03 17:18:12 +01:00
10 changed files with 74 additions and 159 deletions
--- a/.github/workflows/validate-orchestrator-integration.yml
+++ b/.github/workflows/validate-orchestrator-integration.yml
@@ -95,7 +95,7 @@ jobs:
      - name: Run plugin interface unit tests
        run: |
          echo "Running orchestrator-plugin unit tests..."
-          npx vitest run orchestrator-plugin --reporter=verbose
+          npx jest orchestrator-plugin --verbose --detectOpenHandles --forceExit

      - name: Build and pack orchestrator
        working-directory: orchestrator-standalone
@@ -167,10 +167,6 @@ jobs:
        continue-on-error: true
        id: orch-branch

-      - name: Clean corrupted checkout
-        if: steps.orch-branch.outcome == 'failure'
-        run: rm -rf .git || true
-
      - name: Fallback to orchestrator main branch
        if: steps.orch-branch.outcome == 'failure'
        uses: actions/checkout@v4
@@ -324,20 +320,9 @@ jobs:
      - name: Run orchestrator unit tests (fast, no infra)
        timeout-minutes: 2
        run: >-
-          yarn vitest run
-          "orchestrator-guid"
-          "orchestrator-folders"
-          "task-parameter-serializer"
-          "follow-log-stream-service"
-          "runner-availability-service"
-          "provider-url-parser"
-          "provider-loader"
-          "provider-git-manager"
-          "orchestrator-image"
-          "orchestrator-hooks"
-          "orchestrator-github-checks"
-          "middleware-service"
-          --reporter=verbose --no-file-parallelism
+          yarn run test
+          --testPathPattern="orchestrator-guid|orchestrator-folders|task-parameter-serializer|follow-log-stream-service|runner-availability-service|provider-url-parser|provider-loader|provider-git-manager|orchestrator-image|orchestrator-hooks|orchestrator-github-checks|middleware-service"
+          --verbose --detectOpenHandles --forceExit --runInBand

      # --- K8s cluster setup ---
      - name: Clean up disk space before K8s tests
@@ -387,7 +372,7 @@ jobs:
      # --- K8s Test 1: orchestrator-image ---
      - name: Run orchestrator-image test (K8s)
        timeout-minutes: 10
-        run: yarn run test "orchestrator-image" --no-file-parallelism
+        run: yarn run test "orchestrator-image" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -411,7 +396,7 @@ jobs:
      # --- K8s Test 2: orchestrator-kubernetes ---
      - name: Run orchestrator-kubernetes test
        timeout-minutes: 30
-        run: yarn run test "orchestrator-kubernetes" --no-file-parallelism
+        run: yarn run test "orchestrator-kubernetes" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -443,7 +428,7 @@ jobs:
      # --- K8s Test 3: orchestrator-s3-steps ---
      - name: Run orchestrator-s3-steps test (K8s)
        timeout-minutes: 30
-        run: yarn run test "orchestrator-s3-steps" --no-file-parallelism
+        run: yarn run test "orchestrator-s3-steps" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -476,7 +461,7 @@ jobs:
      - name: Run orchestrator-end2end-caching test (K8s)
        timeout-minutes: 60
        continue-on-error: true
-        run: yarn run test "orchestrator-end2end-caching" --no-file-parallelism
+        run: yarn run test "orchestrator-end2end-caching" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -515,7 +500,7 @@ jobs:
      - name: Run orchestrator-end2end-retaining test (K8s)
        timeout-minutes: 60
        continue-on-error: true
-        run: yarn run test "orchestrator-end2end-retaining" --no-file-parallelism
+        run: yarn run test "orchestrator-end2end-retaining" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -575,10 +560,6 @@ jobs:
        continue-on-error: true
        id: orch-branch

-      - name: Clean corrupted checkout
-        if: steps.orch-branch.outcome == 'failure'
-        run: rm -rf .git || true
-
      - name: Fallback to orchestrator main branch
        if: steps.orch-branch.outcome == 'failure'
        uses: actions/checkout@v4
@@ -669,7 +650,7 @@ jobs:
      # --- AWS Test 1: orchestrator-image ---
      - name: Run orchestrator-image test (AWS)
        timeout-minutes: 10
-        run: yarn run test "orchestrator-image" --no-file-parallelism
+        run: yarn run test "orchestrator-image" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -687,7 +668,7 @@ jobs:
      # --- AWS Test 2: orchestrator-environment ---
      - name: Run orchestrator-environment test (AWS)
        timeout-minutes: 30
-        run: yarn run test "orchestrator-environment" --no-file-parallelism
+        run: yarn run test "orchestrator-environment" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -705,7 +686,7 @@ jobs:
      # --- AWS Test 3: orchestrator-s3-steps ---
      - name: Run orchestrator-s3-steps test (AWS)
        timeout-minutes: 30
-        run: yarn run test "orchestrator-s3-steps" --no-file-parallelism
+        run: yarn run test "orchestrator-s3-steps" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -723,7 +704,7 @@ jobs:
      # --- AWS Test 4: orchestrator-hooks ---
      - name: Run orchestrator-hooks test (AWS)
        timeout-minutes: 30
-        run: yarn run test "orchestrator-hooks" --no-file-parallelism
+        run: yarn run test "orchestrator-hooks" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -741,7 +722,7 @@ jobs:
      # --- AWS Test 5: orchestrator-caching ---
      - name: Run orchestrator-caching test (AWS)
        timeout-minutes: 60
-        run: yarn run test "orchestrator-caching" --no-file-parallelism
+        run: yarn run test "orchestrator-caching" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -759,7 +740,7 @@ jobs:
      # --- AWS Test 6: orchestrator-locking-core ---
      - name: Run orchestrator-locking-core test (AWS)
        timeout-minutes: 60
-        run: yarn run test "orchestrator-locking-core" --no-file-parallelism
+        run: yarn run test "orchestrator-locking-core" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -777,7 +758,7 @@ jobs:
      # --- AWS Test 7: orchestrator-locking-get-locked ---
      - name: Run orchestrator-locking-get-locked test (AWS)
        timeout-minutes: 60
-        run: yarn run test "orchestrator-locking-get-locked" --no-file-parallelism
+        run: yarn run test "orchestrator-locking-get-locked" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -801,7 +782,7 @@ jobs:
      - name: Run orchestrator-end2end-caching test (AWS)
        timeout-minutes: 60
        continue-on-error: true
-        run: yarn run test "orchestrator-end2end-caching" --no-file-parallelism
+        run: yarn run test "orchestrator-end2end-caching" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -820,7 +801,7 @@ jobs:
      - name: Run orchestrator-end2end-retaining test (AWS)
        timeout-minutes: 60
        continue-on-error: true
-        run: yarn run test "orchestrator-end2end-retaining" --no-file-parallelism
+        run: yarn run test "orchestrator-end2end-retaining" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -839,7 +820,7 @@ jobs:
      - name: Run orchestrator-end2end-locking test (AWS)
        timeout-minutes: 60
        continue-on-error: true
-        run: yarn run test "orchestrator-end2end-locking" --no-file-parallelism
+        run: yarn run test "orchestrator-end2end-locking" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -884,10 +865,6 @@ jobs:
        continue-on-error: true
        id: orch-branch

-      - name: Clean corrupted checkout
-        if: steps.orch-branch.outcome == 'failure'
-        run: rm -rf .git || true
-
      - name: Fallback to orchestrator main branch
        if: steps.orch-branch.outcome == 'failure'
        uses: actions/checkout@v4
@@ -977,7 +954,7 @@ jobs:
      # --- Local Docker Test 1: orchestrator-image ---
      - name: Run orchestrator-image test (local-docker)
        timeout-minutes: 10
-        run: yarn run test "orchestrator-image" --no-file-parallelism
+        run: yarn run test "orchestrator-image" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -995,7 +972,7 @@ jobs:
      # --- Local Docker Test 2: orchestrator-hooks ---
      - name: Run orchestrator-hooks test (local-docker)
        timeout-minutes: 30
-        run: yarn run test "orchestrator-hooks" --no-file-parallelism
+        run: yarn run test "orchestrator-hooks" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -1013,7 +990,7 @@ jobs:
      # --- Local Docker Test 3: orchestrator-local-persistence ---
      - name: Run orchestrator-local-persistence test (local-docker)
        timeout-minutes: 30
-        run: yarn run test "orchestrator-local-persistence" --no-file-parallelism
+        run: yarn run test "orchestrator-local-persistence" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -1031,7 +1008,7 @@ jobs:
      # --- Local Docker Test 4: orchestrator-caching ---
      - name: Run orchestrator-caching test (local-docker)
        timeout-minutes: 30
-        run: yarn run test "orchestrator-caching" --no-file-parallelism
+        run: yarn run test "orchestrator-caching" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -1049,7 +1026,7 @@ jobs:
      # --- Local Docker Test 5: orchestrator-github-checks ---
      - name: Run orchestrator-github-checks test (local-docker)
        timeout-minutes: 30
-        run: yarn run test "orchestrator-github-checks" --no-file-parallelism
+        run: yarn run test "orchestrator-github-checks" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -1067,7 +1044,7 @@ jobs:
      # --- Local Docker Test 6: orchestrator-locking-core (with S3) ---
      - name: Run orchestrator-locking-core test (local-docker + S3)
        timeout-minutes: 30
-        run: yarn run test "orchestrator-locking-core" --no-file-parallelism
+        run: yarn run test "orchestrator-locking-core" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -1085,7 +1062,7 @@ jobs:
      # --- Local Docker Test 7: orchestrator-locking-get-locked (with S3) ---
      - name: Run orchestrator-locking-get-locked test (local-docker + S3)
        timeout-minutes: 30
-        run: yarn run test "orchestrator-locking-get-locked" --no-file-parallelism
+        run: yarn run test "orchestrator-locking-get-locked" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -1103,7 +1080,7 @@ jobs:
      # --- Local Docker Test 8: orchestrator-s3-steps (with S3) ---
      - name: Run orchestrator-s3-steps test (local-docker + S3)
        timeout-minutes: 30
-        run: yarn run test "orchestrator-s3-steps" --no-file-parallelism
+        run: yarn run test "orchestrator-s3-steps" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -1122,7 +1099,7 @@ jobs:
      - name: Run orchestrator-end2end-caching test (local-docker + S3)
        timeout-minutes: 60
        continue-on-error: true
-        run: yarn run test "orchestrator-end2end-caching" --no-file-parallelism
+        run: yarn run test "orchestrator-end2end-caching" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -1167,10 +1144,6 @@ jobs:
        continue-on-error: true
        id: orch-branch

-      - name: Clean corrupted checkout
-        if: steps.orch-branch.outcome == 'failure'
-        run: rm -rf .git || true
-
      - name: Fallback to orchestrator main branch
        if: steps.orch-branch.outcome == 'failure'
        uses: actions/checkout@v4
@@ -1247,7 +1220,7 @@ jobs:
      # --- Rclone Test ---
      - name: Run orchestrator-rclone-steps test
        timeout-minutes: 30
-        run: yarn run test "orchestrator-rclone-steps" --no-file-parallelism
+        run: yarn run test "orchestrator-rclone-steps" --detectOpenHandles --forceExit --runInBand
        env:
          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
--- a/action.yml
+++ b/action.yml
@@ -178,11 +178,6 @@ inputs:
    default: 'false'
    required: false
    description: 'Skip the activation/deactivation of Unity. This assumes Unity is already activated.'
-  linux64RemoveExecutableExtension:
-    default: 'false'
-    required: false
-    description:
-      'When building for StandaloneLinux64, remove the default file extension of `.x86_64`. Set to true to restore the extensionless behavior from v4.'

 outputs:
  volume:
--- a/package.json
+++ b/package.json
@@ -32,16 +32,16 @@
    "node": ">=18.x"
  },
  "dependencies": {
-    "@actions/cache": "^4.1.0",
+    "@actions/cache": "^4.0.0",
    "@actions/core": "^1.11.1",
    "@actions/exec": "^1.1.1",
-    "@actions/github": "^6.0.1",
+    "@actions/github": "^6.0.0",
    "md5": "^2.3.0",
-    "nanoid": "^3.3.12",
-    "semver": "^7.7.4",
+    "nanoid": "^3.3.1",
+    "semver": "^7.5.2",
    "ts-md5": "^1.3.1",
    "unity-changeset": "^3.1.0",
-    "yaml": "^2.8.4"
+    "yaml": "^2.2.2"
  },
  "devDependencies": {
    "@types/node": "^17.0.23",
--- a/src/model/build-parameters.test.ts
+++ b/src/model/build-parameters.test.ts
@@ -117,21 +117,18 @@ describe('BuildParameters', () => {
    });

    test.each`
-      targetPlatform                        | expectedExtension | androidExportType         | linux64RemoveExecutableExtension
-      ${Platform.types.Android}             | ${'.apk'}         | ${'androidPackage'}       | ${false}
-      ${Platform.types.Android}             | ${'.aab'}         | ${'androidAppBundle'}     | ${true}
-      ${Platform.types.Android}             | ${''}             | ${'androidStudioProject'} | ${false}
-      ${Platform.types.StandaloneWindows}   | ${'.exe'}         | ${'n/a'}                  | ${true}
-      ${Platform.types.StandaloneWindows64} | ${'.exe'}         | ${'n/a'}                  | ${false}
-      ${Platform.types.StandaloneLinux64}   | ${'.x86_64'}      | ${'n/a'}                  | ${false}
-      ${Platform.types.StandaloneLinux64}   | ${''}             | ${'n/a'}                  | ${true}
+      targetPlatform                        | expectedExtension | androidExportType
+      ${Platform.types.Android}             | ${'.apk'}         | ${'androidPackage'}
+      ${Platform.types.Android}             | ${'.aab'}         | ${'androidAppBundle'}
+      ${Platform.types.Android}             | ${''}             | ${'androidStudioProject'}
+      ${Platform.types.StandaloneWindows}   | ${'.exe'}         | ${'n/a'}
+      ${Platform.types.StandaloneWindows64} | ${'.exe'}         | ${'n/a'}
    `(
-      'appends $expectedExtension for $targetPlatform with linux64RemoveExecutableExtension=$linux64RemoveExecutableExtension',
-      async ({ targetPlatform, expectedExtension, androidExportType, linux64RemoveExecutableExtension }) => {
+      'appends $expectedExtension for $targetPlatform with androidExportType $androidExportType',
+      async ({ targetPlatform, expectedExtension, androidExportType }) => {
        vi.spyOn(Input, 'targetPlatform', 'get').mockReturnValue(targetPlatform);
        vi.spyOn(Input, 'buildName', 'get').mockReturnValue(targetPlatform);
        vi.spyOn(Input, 'androidExportType', 'get').mockReturnValue(androidExportType);
-        vi.spyOn(Input, 'linux64RemoveExecutableExtension', 'get').mockReturnValue(linux64RemoveExecutableExtension);
        await expect(BuildParameters.create()).resolves.toEqual(
          expect.objectContaining({ buildFile: `${targetPlatform}${expectedExtension}` }),
        );
--- a/src/model/build-parameters.ts
+++ b/src/model/build-parameters.ts
@@ -6,7 +6,7 @@ import UnityVersioning from './unity-versioning';
 import Versioning from './versioning';
 import { GitRepoReader } from './input-readers/git-repo';
 import { GithubCliReader } from './input-readers/github-cli';
-import { PluginOptions } from './plugin-options';
+import { Cli } from './cli/cli';
 import GitHub from './github';
 import * as core from '@actions/core';

@@ -73,7 +73,6 @@ class BuildParameters {
      Input.buildName,
      Input.targetPlatform,
      Input.androidExportType,
-      Input.linux64RemoveExecutableExtension,
    );
    const editorVersion = UnityVersioning.determineUnityVersion(
      Input.projectPath,
@@ -129,7 +128,7 @@ class BuildParameters {
    }

    const providerStrategy =
-      Input.getInput('providerStrategy') || (PluginOptions.isPluginMode ? 'aws' : 'local');
+      Input.getInput('providerStrategy') || (Cli.isCliMode ? 'aws' : 'local');

    return {
      editorVersion,
@@ -182,19 +181,14 @@ class BuildParameters {
        '0123456789abcdefghijklmnopqrstuvwxyz',
        4,
      )()}`,
-      isCliMode: PluginOptions.isPluginMode,
+      isCliMode: Cli.isCliMode,
      cacheUnityInstallationOnMac: Input.cacheUnityInstallationOnMac,
      unityHubVersionOnMac: Input.unityHubVersionOnMac,
      dockerWorkspacePath: Input.dockerWorkspacePath,
    };
  }

-  static parseBuildFile(
-    filename: string,
-    platform: string,
-    androidExportType: string,
-    linux64RemoveExecutableExtension: boolean,
-  ): string {
+  static parseBuildFile(filename: string, platform: string, androidExportType: string): string {
    if (Platform.isWindows(platform)) {
      return `${filename}.exe`;
    }
@@ -214,10 +208,6 @@ class BuildParameters {
      }
    }

-    if (platform === Platform.types.StandaloneLinux64 && !linux64RemoveExecutableExtension) {
-      return `${filename}.x86_64`;
-    }
-
    return filename;
  }

--- a/src/model/cli/cli.ts
+++ b/src/model/cli/cli.ts
@@ -0,0 +1,16 @@
+export class Cli {
+  public static options: Record<string, any> | undefined;
+  static get isCliMode() {
+    return Cli.options !== undefined && Cli.options.mode !== undefined && Cli.options.mode !== '';
+  }
+  public static query(key: string, alternativeKey: string) {
+    if (Cli.options && Cli.options[key] !== undefined) {
+      return Cli.options[key];
+    }
+    if (Cli.options && alternativeKey && Cli.options[alternativeKey] !== undefined) {
+      return Cli.options[alternativeKey];
+    }
+
+    return;
+  }
+}
--- a/src/model/input.test.ts
+++ b/src/model/input.test.ts
@@ -353,22 +353,4 @@ describe('Input', () => {
      expect(spy).toHaveBeenCalledTimes(1);
    });
  });
-
-  describe('linux64RemoveExecutableExtension', () => {
-    it('returns the default value', () => {
-      expect(Input.linux64RemoveExecutableExtension).toStrictEqual(false);
-    });
-
-    it('returns true when string true is passed', () => {
-      const spy = vi.spyOn(core, 'getInput').mockReturnValue('true');
-      expect(Input.linux64RemoveExecutableExtension).toStrictEqual(true);
-      expect(spy).toHaveBeenCalledTimes(1);
-    });
-
-    it('returns false when string false is passed', () => {
-      const spy = vi.spyOn(core, 'getInput').mockReturnValue('false');
-      expect(Input.linux64RemoveExecutableExtension).toStrictEqual(false);
-      expect(spy).toHaveBeenCalledTimes(1);
-    });
-  });
 });
--- a/src/model/input.ts
+++ b/src/model/input.ts
@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { PluginOptions } from './plugin-options';
+import { Cli } from './cli/cli';
 import Platform from './platform';
 import GitHub from './github';
 import os from 'node:os';
@@ -28,8 +28,8 @@ class Input {
    const alternativeQuery = Input.ToEnvVarFormat(query);

    // Query input sources
-    if (PluginOptions.query(query, alternativeQuery)) {
-      return PluginOptions.query(query, alternativeQuery);
+    if (Cli.query(query, alternativeQuery)) {
+      return Cli.query(query, alternativeQuery);
    }

    if (process.env[query] !== undefined) {
@@ -284,12 +284,6 @@ class Input {
    return Input.getInput('skipActivation')?.toLowerCase() ?? 'false';
  }

-  static get linux64RemoveExecutableExtension(): boolean {
-    const input = Input.getInput('linux64RemoveExecutableExtension') ?? 'false';
-
-    return input === 'true';
-  }
-
  public static ToEnvVarFormat(input: string) {
    if (input.toUpperCase() === input) {
      return input;
--- a/src/model/plugin-options.ts
+++ b/src/model/plugin-options.ts
@@ -1,32 +0,0 @@
-/**
- * Shared options bridge between unity-builder and plugins (e.g. @game-ci/orchestrator).
- *
- * Plugins set PluginOptions.options to pass configuration into BuildParameters
- * and Input. When options are set, isPluginMode is true and query() reads
- * from the options map instead of @actions/core.getInput().
- */
-export class PluginOptions {
-  public static options: Record<string, any> | undefined;
-
-  static get isPluginMode() {
-    return Boolean(PluginOptions.options?.mode);
-  }
-
-  public static query(key: string, alternativeKey: string) {
-    if (PluginOptions.options && PluginOptions.options[key] !== undefined) {
-      return PluginOptions.options[key];
-    }
-    if (
-      PluginOptions.options &&
-      alternativeKey &&
-      PluginOptions.options[alternativeKey] !== undefined
-    ) {
-      return PluginOptions.options[alternativeKey];
-    }
-
-    return;
-  }
-}
-
-// Backwards-compatible alias — the orchestrator still imports { Cli }
-export { PluginOptions as Cli };
--- a/yarn.lock
+++ b/yarn.lock
@@ -5,7 +5,7 @@ __metadata:
  version: 9
  cacheKey: 10

-"@actions/cache@npm:^4.1.0":
+"@actions/cache@npm:^4.0.0":
  version: 4.1.0
  resolution: "@actions/cache@npm:4.1.0"
  dependencies:
@@ -42,7 +42,7 @@ __metadata:
  languageName: node
  linkType: hard

-"@actions/github@npm:^6.0.1":
+"@actions/github@npm:^6.0.0":
  version: 6.0.1
  resolution: "@actions/github@npm:6.0.1"
  dependencies:
@@ -3782,7 +3782,7 @@ __metadata:
  languageName: node
  linkType: hard

-"nanoid@npm:^3.3.11, nanoid@npm:^3.3.12":
+"nanoid@npm:^3.3.1, nanoid@npm:^3.3.11":
  version: 3.3.12
  resolution: "nanoid@npm:3.3.12"
  bin:
@@ -4782,10 +4782,10 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "unity-builder@workspace:."
  dependencies:
-    "@actions/cache": "npm:^4.1.0"
+    "@actions/cache": "npm:^4.0.0"
    "@actions/core": "npm:^1.11.1"
    "@actions/exec": "npm:^1.1.1"
-    "@actions/github": "npm:^6.0.1"
+    "@actions/github": "npm:^6.0.0"
    "@types/node": "npm:^17.0.23"
    "@types/semver": "npm:^7.3.9"
    "@typescript/native-preview": "npm:^7.0.0-dev.20260505.1"
@@ -4798,18 +4798,18 @@ __metadata:
    js-yaml: "npm:^4.1.0"
    lint-staged: "npm:^16.4.0"
    md5: "npm:^2.3.0"
-    nanoid: "npm:^3.3.12"
+    nanoid: "npm:^3.3.1"
    node-fetch: "npm:2"
    oxfmt: "npm:^0.48.0"
    oxlint: "npm:^1.63.0"
-    semver: "npm:^7.7.4"
+    semver: "npm:^7.5.2"
    ts-md5: "npm:^1.3.1"
    ts-node: "npm:10.8.1"
    typescript: "npm:4.7.4"
    unity-changeset: "npm:^3.1.0"
    vite: "npm:^7"
    vitest: "npm:^4"
-    yaml: "npm:^2.8.4"
+    yaml: "npm:^2.2.2"
    yarn-audit-fix: "npm:^9.3.8"
  dependenciesMeta:
    lefthook:
@@ -5181,7 +5181,7 @@ __metadata:
  languageName: node
  linkType: hard

-"yaml@npm:^2.8.2, yaml@npm:^2.8.4":
+"yaml@npm:^2.2.2, yaml@npm:^2.8.2":
  version: 2.8.4
  resolution: "yaml@npm:2.8.4"
  bin:
Author	SHA1	Message	Date
Frostebite	50ea73aec7	Merge branch 'main' into chore/remove-legacy-cli	2026-05-06 22:30:57 +01:00
frostebite	9dbe552c39	chore: remove legacy CLI bootstrap and unused deps Remove InitCliMode/RunCli, @CliFunction decorator, and CliFunctionsRepository. The only registered CLI mode was `print-input` which is unused — all real CLI functionality lives in the orchestrator repo now. This drops 3 dependencies: - commander-ts (decorator-based CLI, needed reflect-metadata) - reflect-metadata (peer dep of commander-ts) - commander (only used for OptionValues type) Cli.options, Cli.isCliMode, and Cli.query remain — the orchestrator plugin sets these directly without commander. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-05-06 22:29:43 +01:00
frostebite	9d20e0b607	Merge branch 'main' of https://github.com/game-ci/unity-builder	2026-05-06 22:01:22 +01:00
frostebite	2321712bb4	fix: remove concurrency block from reusable workflow to prevent deadlock When integrity-check.yml calls validate-orchestrator-integration.yml via workflow_call, both workflows resolve github.workflow to the same name ("Integrity"), creating identical concurrency groups. GitHub detects this as a deadlock and cancels the run. Fix: remove concurrency from the reusable workflow entirely — the caller already manages concurrency for the group. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>	2026-05-03 17:18:12 +01:00