Skip to content
Closed
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
1 change: 1 addition & 0 deletions src/cli-plugin/build-parameters-adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export function createBuildParametersFromCliOptions(options: Record<string, any>
bp.customImage = options.customImage || '';
bp.unitySerial = options.unitySerial || process.env.UNITY_SERIAL || '';
bp.unityLicensingServer = options.unityLicensingServer || '';
bp.unityLicensingToolset = options.unityLicensingToolset || '';
bp.skipActivation = options.skipActivation || 'false';
bp.runnerTempPath = options.runnerTempPath || process.env.RUNNER_TEMP || '';
bp.targetPlatform = options.targetPlatform || 'StandaloneLinux64';
Expand Down
8 changes: 8 additions & 0 deletions src/cli/commands/activate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ interface ActivateArguments extends CliArguments {
unityVersion?: string;
unitySerial?: string;
unityLicensingServer?: string;
unityLicensingToolset?: string;
}

const activateCommand: CommandModule<object, ActivateArguments> = {
Expand All @@ -25,6 +26,13 @@ const activateCommand: CommandModule<object, ActivateArguments> = {
description: 'The Unity licensing server address for floating licenses',
default: '',
})
.option('unity-licensing-toolset', {
alias: 'unityLicensingToolset',
type: 'string',
description:
'Toolset identifier for floating-license servers that host multiple toolsets. Empty by default.',
default: '',
})
.env('UNITY')
.example(
'UNITY_SERIAL=XXXX-XXXX-XXXX-XXXX game-ci activate',
Expand Down
7 changes: 7 additions & 0 deletions src/cli/commands/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,13 @@ const buildCommand: CommandModule<object, BuildArguments> = {
description: 'The Unity licensing server address',
default: '',
})
.option('unity-licensing-toolset', {
alias: 'unityLicensingToolset',
type: 'string',
description:
'Toolset identifier for Unity floating-license servers that host multiple toolsets. Empty by default.',
default: '',
})
.option('container-registry-repository', {
alias: 'containerRegistryRepository',
type: 'string',
Expand Down
1 change: 1 addition & 0 deletions src/cli/input-mapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ export interface CliArguments {
customJob?: string;

unityLicensingServer?: string;
unityLicensingToolset?: string;

cacheUnityInstallationOnMac?: boolean;
unityHubVersionOnMac?: string;
Expand Down
2 changes: 2 additions & 0 deletions src/model/build-parameters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class BuildParameters {
customImage!: string;
unitySerial!: string;
unityLicensingServer!: string;
unityLicensingToolset!: string;
skipActivation!: string;
runnerTempPath!: string;
targetPlatform!: string;
Expand Down Expand Up @@ -203,6 +204,7 @@ class BuildParameters {
p.customImage = Input.customImage || Input.getInput('image') || '';
p.unitySerial = '';
p.unityLicensingServer = '';
p.unityLicensingToolset = '';
p.skipActivation = '';
p.runnerTempPath = process.env.RUNNER_TEMP || '';
p.manualExit = Input.manualExit;
Expand Down
1 change: 1 addition & 0 deletions src/model/orchestrator/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ export interface OrchestratorConfig {
// Authentication
unitySerial?: string;
unityLicensingServer?: string;
unityLicensingToolset?: string;
skipActivation?: string;
runnerTempPath?: string;
manualExit?: boolean;
Expand Down
Loading