actions
/
unity-builder
mirror of https://github.com/game-ci/unity-builder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup and corrections

pull/273/head
Frostebite 2021-08-01 17:19:26 +01:00
parent 518daa0078
commit b363886ecd
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/index.js vendored
View File

@ -2133,10 +2133,10 @@ class RemoteBuilder {
this.repoPathFull = `${this.buildPathFull}/${repositoryFolder}`; this.repoPathFull = `${this.buildPathFull}/${repositoryFolder}`;
this.projectPathFull = `${this.repoPathFull}/${buildParameters.projectPath}`; this.projectPathFull = `${this.repoPathFull}/${buildParameters.projectPath}`;
this.libraryFolderFull = `${this.projectPathFull}/Library`; this.libraryFolderFull = `${this.projectPathFull}/Library`;
yield RemoteBuilder.SetupStep(`setup${buildUid}`, buildParameters, branchName, defaultSecretsArray); yield RemoteBuilder.SetupStep(`${buildUid}`, buildParameters, branchName, defaultSecretsArray);
yield RemoteBuilder.BuildStep(`build${buildUid}`, buildParameters, baseImage, defaultSecretsArray); yield RemoteBuilder.BuildStep(`${buildUid}`, buildParameters, baseImage, defaultSecretsArray);
yield RemoteBuilder.CompressionStep(`compress${buildUid}`, buildParameters, branchName, defaultSecretsArray); yield RemoteBuilder.CompressionStep(`${buildUid}`, buildParameters, branchName, defaultSecretsArray);
yield RemoteBuilder.UploadArtifacts(`upload${buildUid}`, buildParameters, branchName, defaultSecretsArray); yield RemoteBuilder.UploadArtifacts(`${buildUid}`, buildParameters, branchName, defaultSecretsArray);
if (this.SteamDeploy) { if (this.SteamDeploy) {
yield RemoteBuilder.DeployToSteam(buildUid, buildParameters, defaultSecretsArray); yield RemoteBuilder.DeployToSteam(buildUid, buildParameters, defaultSecretsArray);
} }

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/remote-builder/handleCaching.sh vendored
View File

@ -43,8 +43,8 @@ if [ ! -z "$latestLibraryCacheFile" ]; then
fi fi
# Restore LFS cache # Restore LFS cache
if [ ! -v "$LFS_ASSETS_HASH" ] && [ -f "$LFS_ASSETS_HASH" ] if [ ! -v "$LFS_ASSETS_HASH" ] && [ -f "$LFS_ASSETS_HASH.zip" ]
then latestLFSCacheFile=LFS_ASSETS_HASH then latestLFSCacheFile="$LFS_ASSETS_HASH.zip"
else latestLFSCacheFile=$(ls -t "$lfsCacheFolder" | grep .zip$ | head -1) else latestLFSCacheFile=$(ls -t "$lfsCacheFolder" | grep .zip$ | head -1)
fi fi

10
src/model/remote-builder/remote-builder.ts
View File

@ -12,8 +12,6 @@ const cacheFolderFull = `/${buildVolumeFolder}/${cacheFolder}`;
class RemoteBuilder { class RemoteBuilder {
static SteamDeploy: boolean = false; static SteamDeploy: boolean = false;
private static readonly remoteBuilderUtilityRepoFolder: string;
private static readonly remoteBuilderSteamUtilityRepoFolder: string;
private static buildPathFull: string; private static buildPathFull: string;
private static builderPathFull: string; private static builderPathFull: string;
private static steamPathFull: string; private static steamPathFull: string;
@ -71,10 +69,10 @@ class RemoteBuilder {
this.projectPathFull = `${this.repoPathFull}/${buildParameters.projectPath}`; this.projectPathFull = `${this.repoPathFull}/${buildParameters.projectPath}`;
this.libraryFolderFull = `${this.projectPathFull}/Library`; this.libraryFolderFull = `${this.projectPathFull}/Library`;
await RemoteBuilder.SetupStep(`setup${buildUid}`, buildParameters, branchName, defaultSecretsArray); await RemoteBuilder.SetupStep(`${buildUid}`, buildParameters, branchName, defaultSecretsArray);
await RemoteBuilder.BuildStep(`build${buildUid}`, buildParameters, baseImage, defaultSecretsArray); await RemoteBuilder.BuildStep(`${buildUid}`, buildParameters, baseImage, defaultSecretsArray);
await RemoteBuilder.CompressionStep(`compress${buildUid}`, buildParameters, branchName, defaultSecretsArray); await RemoteBuilder.CompressionStep(`${buildUid}`, buildParameters, branchName, defaultSecretsArray);
await RemoteBuilder.UploadArtifacts(`upload${buildUid}`, buildParameters, branchName, defaultSecretsArray); await RemoteBuilder.UploadArtifacts(`${buildUid}`, buildParameters, branchName, defaultSecretsArray);
if (this.SteamDeploy) { if (this.SteamDeploy) {
await RemoteBuilder.DeployToSteam(buildUid, buildParameters, defaultSecretsArray); await RemoteBuilder.DeployToSteam(buildUid, buildParameters, defaultSecretsArray);
} }