Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions src/model/docker.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,61 @@
import { describe, it, expect, mock, afterEach } from 'bun:test';
import { Action } from './action.ts';
import { Docker } from './docker.ts';
import { System } from './system/system.ts';
import { UnityBuildValidation } from './unity/build-validation/unity-build-validation.ts';

describe('Docker', () => {
const originalSystemRun = System.run;
const originalValidateBuild = UnityBuildValidation.validateBuild;

afterEach(() => {
System.run = originalSystemRun;
UnityBuildValidation.validateBuild = originalValidateBuild;
});

it('skips build-output validation for activate-only runs (game-ci/unity-activate#111)', async () => {
// Real bug: validateBuild() requires a "# Build results #" section,
// which only a real build ever produces - it threw on every successful
// activation, since there's nothing to build.
System.run = mock(() => Promise.resolve({ output: 'Activation complete.', error: '' }));
const validateBuildMock = mock(() => {});
UnityBuildValidation.validateBuild = validateBuildMock;

await Docker.run('game-ci/unity-editor-stub:latest', {
hostOS: 'linux',
hostPlatform: 'linux',
currentWorkDir: '/home/runner/work/cli/cli',
homeDir: '/home/runner',
cliDistPath: '/home/runner/work/cli/cli/dist',
sshAgent: '',
gitPrivateToken: '',
dockerWorkspacePath: '/github/workspace',
engine: 'unity',
activateOnly: true,
} as any);

expect(validateBuildMock).not.toHaveBeenCalled();
});

it('still validates build output for real (non-activate-only) builds', async () => {
System.run = mock(() => Promise.resolve({ output: '# Build results #\nErrors: 0\nSize:', error: '' }));
const validateBuildMock = mock(() => {});
UnityBuildValidation.validateBuild = validateBuildMock;

await Docker.run('game-ci/unity-editor-stub:latest', {
hostOS: 'linux',
hostPlatform: 'linux',
currentWorkDir: '/home/runner/work/cli/cli',
homeDir: '/home/runner',
cliDistPath: '/home/runner/work/cli/cli/dist',
sshAgent: '',
gitPrivateToken: '',
dockerWorkspacePath: '/github/workspace',
engine: 'unity',
} as any);

expect(validateBuildMock).toHaveBeenCalled();
});
it('builds a continuous Linux docker command', () => {
const command = (Docker as any).getLinuxCommand('game-ci/unity-editor-stub:latest', {
hostOS: 'linux',
Expand Down
11 changes: 9 additions & 2 deletions src/model/docker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function engineEnvVars(options: Options) {

class Docker {
static async run(image: string, options: Options) {
const { hostPlatform, hostOS, engine } = options;
const { hostPlatform, hostOS, engine, activateOnly } = options;

log.warning(`running docker process for ${hostOS} (${hostPlatform})`);

Expand All @@ -35,9 +35,16 @@ class Docker {

const dockerRun = await System.run(command);

// Real bug (game-ci/unity-activate#111): validateBuild() requires a
// "# Build results #" section, which only ever appears after a real
// build. An activate-only run never produces one - it was throwing
// "There was an error building the project" on every successful
// activation, because there's no build to validate in the first place.
switch (engine) {
case 'unity':
UnityBuildValidation.validateBuild(dockerRun.output);
if (!activateOnly) {
UnityBuildValidation.validateBuild(dockerRun.output);
}
break;
}
} catch (error: any) {
Expand Down
Loading