integrate PR #686

This commit is contained in:
frostebite
2026-01-28 07:19:21 +00:00
parent 4393f04d38
commit 08eabcf899
11 changed files with 93 additions and 14 deletions

21
dist/index.js generated vendored
View File

@@ -341,7 +341,9 @@ class BuildParameters {
branch: input_1.default.branch.replace('/head', '') || (await git_repo_1.GitRepoReader.GetBranch()),
cloudRunnerBranch: cloud_runner_options_1.default.cloudRunnerBranch.split('/').reverse()[0],
cloudRunnerDebug: cloud_runner_options_1.default.cloudRunnerDebug,
githubRepo: (input_1.default.githubRepo ?? (await git_repo_1.GitRepoReader.GetRemote())) || 'game-ci/unity-builder',
githubRepo: (input_1.default.githubRepo ?? (await git_repo_1.GitRepoReader.GetRemote())) || cloud_runner_options_1.default.cloudRunnerRepoName,
cloudRunnerRepoName: cloud_runner_options_1.default.cloudRunnerRepoName,
cloneDepth: Number.parseInt(cloud_runner_options_1.default.cloneDepth),
isCliMode: cli_1.Cli.isCliMode,
awsStackName: cloud_runner_options_1.default.awsStackName,
awsEndpoint: cloud_runner_options_1.default.awsEndpoint,
@@ -1166,7 +1168,7 @@ class CloudRunnerFolders {
return node_path_1.default.join(CloudRunnerFolders.cacheFolderForCacheKeyFull, `Library`);
}
static get unityBuilderRepoUrl() {
return `https://${cloud_runner_1.default.buildParameters.gitPrivateToken}@github.com/game-ci/unity-builder.git`;
return `https://${cloud_runner_1.default.buildParameters.gitPrivateToken}@github.com/${cloud_runner_1.default.buildParameters.cloudRunnerRepoName}.git`;
}
static get targetBuildRepoUrl() {
return `https://${cloud_runner_1.default.buildParameters.gitPrivateToken}@github.com/${cloud_runner_1.default.buildParameters.githubRepo}.git`;
@@ -1321,6 +1323,12 @@ class CloudRunnerOptions {
static get githubRepoName() {
return CloudRunnerOptions.getInput('githubRepoName') || CloudRunnerOptions.githubRepo?.split(`/`)[1] || '';
}
static get cloudRunnerRepoName() {
return CloudRunnerOptions.getInput('cloudRunnerRepoName') || 'game-ci/unity-builder';
}
static get cloneDepth() {
return CloudRunnerOptions.getInput('cloneDepth') || '50';
}
static get finalHooks() {
return CloudRunnerOptions.getInput('finalHooks')?.split(',') || [];
}
@@ -1906,6 +1914,7 @@ class AWSCloudFormationTemplates {
}
static getSecretDefinitionTemplate(p1, p2) {
return `
Secrets:
- Name: '${p1}'
ValueFrom: !Ref ${p2}Secret
`;
@@ -3157,8 +3166,7 @@ Resources:
- SourceVolume: efs-data
ContainerPath: !Ref EFSMountDirectory
ReadOnly: false
Secrets:
# template secrets p3 - container def
# template secrets p3 - container def
LogConfiguration:
LogDriver: awslogs
Options:
@@ -6846,7 +6854,8 @@ class RemoteClient {
await cloud_runner_system_1.CloudRunnerSystem.Run(`git config --global filter.lfs.smudge "git-lfs smudge --skip -- %f"`);
await cloud_runner_system_1.CloudRunnerSystem.Run(`git config --global filter.lfs.process "git-lfs filter-process --skip"`);
try {
await cloud_runner_system_1.CloudRunnerSystem.Run(`git clone ${cloud_runner_folders_1.CloudRunnerFolders.targetBuildRepoUrl} ${node_path_1.default.basename(cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute)}`);
const depthArg = cloud_runner_options_1.default.cloneDepth !== '0' ? `--depth ${cloud_runner_options_1.default.cloneDepth}` : '';
await cloud_runner_system_1.CloudRunnerSystem.Run(`git clone ${depthArg} ${cloud_runner_folders_1.CloudRunnerFolders.targetBuildRepoUrl} ${node_path_1.default.basename(cloud_runner_folders_1.CloudRunnerFolders.repoPathAbsolute)}`.trim());
}
catch (error) {
throw error;
@@ -9425,7 +9434,7 @@ class ImageTag {
this.targetPlatform = targetPlatform;
this.builderPlatform = ImageTag.getTargetPlatformToTargetPlatformSuffixMap(targetPlatform, editorVersion, providerStrategy);
this.imagePlatformPrefix = ImageTag.getImagePlatformPrefixes(buildPlatform);
this.imageRollingVersion = Number(containerRegistryImageVersion); // Will automatically roll to the latest non-breaking version.
this.imageRollingVersion = containerRegistryImageVersion; // Will automatically roll to the latest non-breaking version.
}
static get versionPattern() {
return /^\d+\.\d+\.\d+[a-z]\d+$/;

2
dist/index.js.map generated vendored

File diff suppressed because one or more lines are too long