mirror of
https://github.com/game-ci/unity-builder.git
synced 2026-06-02 14:56:16 -07:00
* chore: quality-tightening (oxfmt + oxlint + tsc + vitest + husky + actionlint)
Standard rollout for unity-builder. Most of the work was porting 24
test files from jest 27 to vitest 4.
- prettier -> oxfmt
- eslint (with @typescript-eslint, github, jest, prettier, unicorn) ->
oxlint with eslint-plugin-unicorn
- jest 27 + jest-circus + ts-jest + @types/jest + @jest/globals ->
vitest 4 + vite 7 + @vitest/coverage-istanbul (jest config files
removed)
- new: tsgo --noEmit (alongside tsc fallback)
- lefthook (and lefthook.yml) -> husky 9 with the standard
scripts/ensure-husky.mjs self-heal pattern + lint-staged
- new: gitleaks, actionlint, shellcheck as mise-managed binaries
- TypeScript bumped target ES2020 -> ES2022 + lib ES2022 + DOM (for
Error.cause and modern globals)
Test migration (24 files):
- Bulk-converted jest.* -> vi.*; jest.Mocked -> Mocked from vitest;
jest.MockedFunction -> MockedFunction.
- Added vitest imports to all *.test.ts files (and __mocks__/*.ts)
that didn't have them.
- src/index.ts: extracted runMain() as a named export and gated the
module-level invocation behind NODE_ENV !== 'test'. The
index-plugin-features test now calls runMain() directly instead of
relying on jest's removed vi.isolateModules.
- index-plugin-features.test.ts: moved hoisted refs (mockPlugin,
mockLoadOrchestratorPlugin) into vi.hoisted() so vi.mock factories
can reference them. Replaced arrow constructor mock for ImageTag
with regular function() {...} (vitest 4 disallows arrows as ctors).
Replaced require('./model') / require('@actions/core') inside test
bodies with top-level imports.
- model/orchestrator-plugin.test.ts: dropped jest's '{ virtual: true }'
flag (vitest doesn't support it); replaced the
'mock factory throws' pattern with 'createPlugin throws' so vitest
doesn't wrap the error message at the assertion site.
- model/versioning.test.ts: stray jest.spyOn -> vi.spyOn; replaced
mockImplementation() with no args (jest pattern) by
mockResolvedValue('') / mockImplementation(() => undefined) where
the source expects a string return.
Workflow shell-quoting cleanup (actionlint):
- All bare $GITHUB_STEP_SUMMARY / $GITHUB_OUTPUT / $GITHUB_ENV
redirects quoted across 2 workflows (SC2086).
- s3://$AWS_STACK_NAME / s3://$BUCKET_NAME -> s3://"$AWS_STACK_NAME"
/ s3://"$BUCKET_NAME".
- 'for i in {1..N}; do ... done' loops where i isn't referenced in
the body renamed to 'for _ in' (SC2034).
- 'grep ... | wc -l' -> 'grep -c ...' (SC2126).
- Multiple consecutive '>> $file' redirects in
validate-community-plugins.yml summary block collapsed into a
single block redirect (SC2129).
- 'cat $file | python3 -c "..."' -> 'python3 -c "..." < $file'
(SC2002).
- http://${VAR}:port -> http://"${VAR}":port (SC2086).
tsgo: kept tsc --noEmit as the default 'typecheck' because
unity-builder publishes CommonJS for the GitHub Action consumer,
which conflicts with tsgo's bundler/node16 moduleResolution
requirement (per playbook trap #9). 'yarn typecheck:tsgo' is wired
up for when consumers move to ESM.
Caveats: 28 pre-existing oxlint warnings remain (mostly
typescript/no-explicit-any across the build-parameter shapes and
vitest/no-disabled-tests on 2 explicitly skipped scenarios). Per
playbook trap #22 the lint script drops --deny-warnings.
Verified locally: format clean, lint 0/28, typecheck clean,
test 340/342 (2 pre-existing skipped), actionlint clean across all
12 workflows.
* ci(unity-builder): fix Tests + Plugin Architecture Health on quality-tightening
Three issues surfaced in CI after the jest -> vitest port:
1. **Obsolete snapshot blocks Tests job.**
src/model/__snapshots__/versioning.test.ts.snap had two entries
for the same 'throws for invalid strategy' assertion: one in the
vitest format ('Versioning > determineBuildVersion > ...') and one
in the legacy jest format without the '>'. vitest correctly
regenerates the new one and flags the old one as obsolete; CI
runs without --update so 'Test Files 1 failed' even though all
343 tests passed. Removed the obsolete entry.
2. **'Plugin Architecture Health' workflow still calls jest.**
.github/workflows/validate-orchestrator.yml had two 'npx jest'
steps (orchestrator-plugin unit tests + orchestrator-standalone
tests). The unity-builder + orchestrator codebases are both on
vitest now. Replaced both with 'yarn vitest run'.
3. **jest-fail-on-console + src/jest.setup.ts left over.**
The earlier vitest port missed the jest-fail-on-console
integration. yarn install in CI surfaced
YN0002: doesn't provide @jest/globals (requested by
jest-fail-on-console). Removed jest-fail-on-console + jest.setup.ts;
added src/test/setup.ts with the equivalent vitest beforeEach
spies (same as unity-test-runner).
---------
Co-authored-by: frostebite <jas.f.ukcmti@gmail.com>
144 lines
5.7 KiB
TypeScript
144 lines
5.7 KiB
TypeScript
import ImageEnvironmentFactory from './image-environment-factory';
|
|
import { existsSync, mkdirSync } from 'node:fs';
|
|
import path from 'node:path';
|
|
import { ExecOptions, exec } from '@actions/exec';
|
|
import { DockerParameters, StringKeyValuePair } from './shared-types';
|
|
|
|
class Docker {
|
|
static async run(
|
|
image: string,
|
|
parameters: DockerParameters,
|
|
silent: boolean = false,
|
|
overrideCommands: string = '',
|
|
additionalVariables: StringKeyValuePair[] = [],
|
|
options: ExecOptions = {},
|
|
entrypointBash: boolean = false,
|
|
): Promise<number> {
|
|
let runCommand = '';
|
|
switch (process.platform) {
|
|
case 'linux':
|
|
runCommand = this.getLinuxCommand(
|
|
image,
|
|
parameters,
|
|
overrideCommands,
|
|
additionalVariables,
|
|
entrypointBash,
|
|
);
|
|
break;
|
|
case 'win32':
|
|
runCommand = this.getWindowsCommand(image, parameters);
|
|
break;
|
|
default:
|
|
throw new Error(`Operation system, ${process.platform}, is not supported yet.`);
|
|
}
|
|
|
|
options.silent = silent;
|
|
options.ignoreReturnCode = true;
|
|
|
|
return await exec(runCommand, undefined, options);
|
|
}
|
|
|
|
static getLinuxCommand(
|
|
image: string,
|
|
parameters: DockerParameters,
|
|
overrideCommands: string = '',
|
|
additionalVariables: StringKeyValuePair[] = [],
|
|
entrypointBash: boolean = false,
|
|
): string {
|
|
const {
|
|
workspace,
|
|
actionFolder,
|
|
useHostNetwork,
|
|
runnerTempPath,
|
|
sshAgent,
|
|
sshPublicKeysDirectoryPath,
|
|
gitPrivateToken,
|
|
dockerWorkspacePath,
|
|
dockerCpuLimit,
|
|
dockerMemoryLimit,
|
|
} = parameters;
|
|
|
|
const githubHome = path.join(runnerTempPath, '_github_home');
|
|
if (!existsSync(githubHome)) mkdirSync(githubHome);
|
|
const githubWorkflow = path.join(runnerTempPath, '_github_workflow');
|
|
if (!existsSync(githubWorkflow)) mkdirSync(githubWorkflow);
|
|
|
|
// Alpine-based images (alpine, rclone/rclone, etc.) don't have /bin/bash, only /bin/sh
|
|
const isAlpineBasedImage = image === 'alpine' || image.startsWith('rclone/');
|
|
const commandPrefix = isAlpineBasedImage ? `/bin/sh` : `/bin/bash`;
|
|
|
|
return `docker run \
|
|
--workdir ${dockerWorkspacePath} \
|
|
--rm \
|
|
${ImageEnvironmentFactory.getEnvVarString(parameters, additionalVariables)} \
|
|
--env GITHUB_WORKSPACE=${dockerWorkspacePath} \
|
|
--env GIT_CONFIG_EXTENSIONS \
|
|
${gitPrivateToken ? `--env GIT_PRIVATE_TOKEN="${gitPrivateToken}"` : ''} \
|
|
${sshAgent ? '--env SSH_AUTH_SOCK=/ssh-agent' : ''} \
|
|
--volume "${githubHome}":"/root:z" \
|
|
--volume "${githubWorkflow}":"/github/workflow:z" \
|
|
--volume "${workspace}":"${dockerWorkspacePath}:z" \
|
|
--volume "${actionFolder}/default-build-script:/UnityBuilderAction:z" \
|
|
--volume "${actionFolder}/platforms/ubuntu/steps:/steps:z" \
|
|
--volume "${actionFolder}/platforms/ubuntu/entrypoint.sh:/entrypoint.sh:z" \
|
|
--volume "${actionFolder}/unity-config:/usr/share/unity3d/config/:z" \
|
|
--volume "${actionFolder}/BlankProject":"/BlankProject:z" \
|
|
--cpus=${dockerCpuLimit} \
|
|
--memory=${dockerMemoryLimit} \
|
|
${sshAgent ? `--volume ${sshAgent}:/ssh-agent` : ''} \
|
|
${
|
|
sshAgent && !sshPublicKeysDirectoryPath
|
|
? '--volume /home/runner/.ssh/known_hosts:/root/.ssh/known_hosts:ro'
|
|
: ''
|
|
} \
|
|
${sshPublicKeysDirectoryPath ? `--volume ${sshPublicKeysDirectoryPath}:/root/.ssh:ro` : ''} \
|
|
${useHostNetwork ? '--net=host' : ''} \
|
|
${entrypointBash ? `--entrypoint ${commandPrefix}` : ``} \
|
|
${image} \
|
|
${entrypointBash ? `-c` : `${commandPrefix} -c`} \
|
|
"${overrideCommands !== '' ? overrideCommands : `/entrypoint.sh`}"`;
|
|
}
|
|
|
|
static getWindowsCommand(image: string, parameters: DockerParameters): string {
|
|
const {
|
|
workspace,
|
|
actionFolder,
|
|
runnerTempPath,
|
|
gitPrivateToken,
|
|
dockerWorkspacePath,
|
|
dockerCpuLimit,
|
|
dockerMemoryLimit,
|
|
dockerIsolationMode,
|
|
} = parameters;
|
|
|
|
const githubHome = path.join(runnerTempPath, '_github_home');
|
|
if (!existsSync(githubHome)) mkdirSync(githubHome);
|
|
|
|
return `docker run \
|
|
--workdir c:${dockerWorkspacePath} \
|
|
--rm \
|
|
${ImageEnvironmentFactory.getEnvVarString(parameters)} \
|
|
--env BEE_CACHE_DIRECTORY=c:${dockerWorkspacePath}/Library/bee_cache \
|
|
--env GITHUB_WORKSPACE=c:${dockerWorkspacePath} \
|
|
${gitPrivateToken ? `--env GIT_PRIVATE_TOKEN="${gitPrivateToken}"` : ''} \
|
|
--volume "${workspace}":"c:${dockerWorkspacePath}" \
|
|
--volume "${githubHome}":"C:/githubhome" \
|
|
--volume "c:/regkeys":"c:/regkeys" \
|
|
--volume "C:/Program Files/Microsoft Visual Studio":"C:/Program Files/Microsoft Visual Studio" \
|
|
--volume "C:/Program Files (x86)/Microsoft Visual Studio":"C:/Program Files (x86)/Microsoft Visual Studio" \
|
|
--volume "C:/Program Files (x86)/Windows Kits":"C:/Program Files (x86)/Windows Kits" \
|
|
--volume "C:/ProgramData/Microsoft/VisualStudio":"C:/ProgramData/Microsoft/VisualStudio" \
|
|
--volume "${actionFolder}/default-build-script":"c:/UnityBuilderAction" \
|
|
--volume "${actionFolder}/platforms/windows":"c:/steps" \
|
|
--volume "${actionFolder}/unity-config":"C:/ProgramData/Unity/config" \
|
|
--volume "${actionFolder}/BlankProject":"c:/BlankProject" \
|
|
--cpus=${dockerCpuLimit} \
|
|
--memory=${dockerMemoryLimit} \
|
|
--isolation=${dockerIsolationMode} \
|
|
${image} \
|
|
powershell c:/steps/entrypoint.ps1`;
|
|
}
|
|
}
|
|
|
|
export default Docker;
|