cleanup and corrections
parent
518daa0078
commit
b363886ecd
|
|
@ -2133,10 +2133,10 @@ class RemoteBuilder {
|
|||
this.repoPathFull = `${this.buildPathFull}/${repositoryFolder}`;
|
||||
this.projectPathFull = `${this.repoPathFull}/${buildParameters.projectPath}`;
|
||||
this.libraryFolderFull = `${this.projectPathFull}/Library`;
|
||||
yield RemoteBuilder.SetupStep(`setup${buildUid}`, buildParameters, branchName, defaultSecretsArray);
|
||||
yield RemoteBuilder.BuildStep(`build${buildUid}`, buildParameters, baseImage, defaultSecretsArray);
|
||||
yield RemoteBuilder.CompressionStep(`compress${buildUid}`, buildParameters, branchName, defaultSecretsArray);
|
||||
yield RemoteBuilder.UploadArtifacts(`upload${buildUid}`, buildParameters, branchName, defaultSecretsArray);
|
||||
yield RemoteBuilder.SetupStep(`${buildUid}`, buildParameters, branchName, defaultSecretsArray);
|
||||
yield RemoteBuilder.BuildStep(`${buildUid}`, buildParameters, baseImage, defaultSecretsArray);
|
||||
yield RemoteBuilder.CompressionStep(`${buildUid}`, buildParameters, branchName, defaultSecretsArray);
|
||||
yield RemoteBuilder.UploadArtifacts(`${buildUid}`, buildParameters, branchName, defaultSecretsArray);
|
||||
if (this.SteamDeploy) {
|
||||
yield RemoteBuilder.DeployToSteam(buildUid, buildParameters, defaultSecretsArray);
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -43,8 +43,8 @@ if [ ! -z "$latestLibraryCacheFile" ]; then
|
|||
fi
|
||||
|
||||
# Restore LFS cache
|
||||
if [ ! -v "$LFS_ASSETS_HASH" ] && [ -f "$LFS_ASSETS_HASH" ]
|
||||
then latestLFSCacheFile=LFS_ASSETS_HASH
|
||||
if [ ! -v "$LFS_ASSETS_HASH" ] && [ -f "$LFS_ASSETS_HASH.zip" ]
|
||||
then latestLFSCacheFile="$LFS_ASSETS_HASH.zip"
|
||||
else latestLFSCacheFile=$(ls -t "$lfsCacheFolder" | grep .zip$ | head -1)
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@ const cacheFolderFull = `/${buildVolumeFolder}/${cacheFolder}`;
|
|||
|
||||
class RemoteBuilder {
|
||||
static SteamDeploy: boolean = false;
|
||||
private static readonly remoteBuilderUtilityRepoFolder: string;
|
||||
private static readonly remoteBuilderSteamUtilityRepoFolder: string;
|
||||
private static buildPathFull: string;
|
||||
private static builderPathFull: string;
|
||||
private static steamPathFull: string;
|
||||
|
|
@ -71,10 +69,10 @@ class RemoteBuilder {
|
|||
this.projectPathFull = `${this.repoPathFull}/${buildParameters.projectPath}`;
|
||||
this.libraryFolderFull = `${this.projectPathFull}/Library`;
|
||||
|
||||
await RemoteBuilder.SetupStep(`setup${buildUid}`, buildParameters, branchName, defaultSecretsArray);
|
||||
await RemoteBuilder.BuildStep(`build${buildUid}`, buildParameters, baseImage, defaultSecretsArray);
|
||||
await RemoteBuilder.CompressionStep(`compress${buildUid}`, buildParameters, branchName, defaultSecretsArray);
|
||||
await RemoteBuilder.UploadArtifacts(`upload${buildUid}`, buildParameters, branchName, defaultSecretsArray);
|
||||
await RemoteBuilder.SetupStep(`${buildUid}`, buildParameters, branchName, defaultSecretsArray);
|
||||
await RemoteBuilder.BuildStep(`${buildUid}`, buildParameters, baseImage, defaultSecretsArray);
|
||||
await RemoteBuilder.CompressionStep(`${buildUid}`, buildParameters, branchName, defaultSecretsArray);
|
||||
await RemoteBuilder.UploadArtifacts(`${buildUid}`, buildParameters, branchName, defaultSecretsArray);
|
||||
if (this.SteamDeploy) {
|
||||
await RemoteBuilder.DeployToSteam(buildUid, buildParameters, defaultSecretsArray);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue