Cleanup
parent
fec2cc69c9
commit
5d05341f7f
|
|
@ -2201,11 +2201,11 @@ class RemoteBuilder {
|
||||||
core.info('Starting step 1/4 clone and restore cache)');
|
core.info('Starting step 1/4 clone and restore cache)');
|
||||||
const lfsDirectory = `${this.repoPathFull}/.git/lfs`;
|
const lfsDirectory = `${this.repoPathFull}/.git/lfs`;
|
||||||
const testLFSFile = `${this.projectPathFull}/Assets/LFS_Test_File.jpg`;
|
const testLFSFile = `${this.projectPathFull}/Assets/LFS_Test_File.jpg`;
|
||||||
const repo = `https://${this.buildParams.githubToken}@github.com/game-ci/unity-builder.git`;
|
const unityBuilderRepoUrl = `https://${this.buildParams.githubToken}@github.com/game-ci/unity-builder.git`;
|
||||||
const repo2 = `https://${this.buildParams.githubToken}@github.com/game-ci/steam-deploy.git`;
|
const steamDeployRepoUrl = `https://${this.buildParams.githubToken}@github.com/game-ci/steam-deploy.git`;
|
||||||
const repo3 = `https://${this.buildParams.githubToken}@github.com/${process.env.GITHUB_REPOSITORY}.git`;
|
const targetBuildRepoUrl = `https://${this.buildParams.githubToken}@github.com/${process.env.GITHUB_REPOSITORY}.git`;
|
||||||
const purgeRemoteCache = process.env.PURGE_REMOTE_BUILDER_CACHE !== undefined;
|
const purgeRemoteCache = process.env.PURGE_REMOTE_BUILDER_CACHE !== undefined;
|
||||||
const initializeSourceRepoForCaching = `${this.builderPathFull}/dist/remote-builder/cloneNoLFS.sh "${this.repoPathFull}" "${repo3}" "${testLFSFile}"`;
|
const initializeSourceRepoForCaching = `${this.builderPathFull}/dist/remote-builder/cloneNoLFS.sh "${this.repoPathFull}" "${targetBuildRepoUrl}" "${testLFSFile}"`;
|
||||||
const handleCaching = `${this.builderPathFull}/dist/remote-builder/handleCaching.sh "${cacheFolderFull}" ${this.libraryFolderFull}" "${lfsDirectory}" "${purgeRemoteCache}"`;
|
const handleCaching = `${this.builderPathFull}/dist/remote-builder/handleCaching.sh "${cacheFolderFull}" ${this.libraryFolderFull}" "${lfsDirectory}" "${purgeRemoteCache}"`;
|
||||||
yield this.RemoteBuilderProviderPlatform.runBuildTask(this.buildId, 'alpine/git', [
|
yield this.RemoteBuilderProviderPlatform.runBuildTask(this.buildId, 'alpine/git', [
|
||||||
` printenv
|
` printenv
|
||||||
|
|
@ -2220,10 +2220,10 @@ class RemoteBuilder {
|
||||||
#
|
#
|
||||||
echo ' '
|
echo ' '
|
||||||
echo 'Cloning utility repositories for remote builder'
|
echo 'Cloning utility repositories for remote builder'
|
||||||
git clone -q --branch "remote-builder/unified-providers" ${repo} ${this.builderPathFull}
|
git clone -q --branch "remote-builder/unified-providers" ${unityBuilderRepoUrl} ${this.builderPathFull}
|
||||||
echo 'Cloned ${repo}'
|
echo 'Cloned ${unityBuilderRepoUrl}'
|
||||||
git clone -q ${repo2} ${this.steamPathFull}
|
git clone -q ${steamDeployRepoUrl} ${this.steamPathFull}
|
||||||
echo 'Cloned ${repo2}'
|
echo 'Cloned ${steamDeployRepoUrl}'
|
||||||
#
|
#
|
||||||
echo ' '
|
echo ' '
|
||||||
echo 'Initializing source repository for cloning with caching of LFS files'
|
echo 'Initializing source repository for cloning with caching of LFS files'
|
||||||
|
|
@ -2232,7 +2232,7 @@ class RemoteBuilder {
|
||||||
${process.env.DEBUG ? '#' : ''}echo ' '
|
${process.env.DEBUG ? '#' : ''}echo ' '
|
||||||
${process.env.DEBUG ? '#' : ''}echo 'Large File before LFS caching and pull'
|
${process.env.DEBUG ? '#' : ''}echo 'Large File before LFS caching and pull'
|
||||||
${process.env.DEBUG ? '#' : ''}ls -alh "${lfsDirectory}"
|
${process.env.DEBUG ? '#' : ''}ls -alh "${lfsDirectory}"
|
||||||
echo ' '
|
${process.env.DEBUG ? '#' : ''}echo ' '
|
||||||
echo 'Source repository initialized'
|
echo 'Source repository initialized'
|
||||||
echo ' '
|
echo ' '
|
||||||
echo 'Checking cache for the Unity project Library and git LFS files'
|
echo 'Checking cache for the Unity project Library and git LFS files'
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -80,12 +80,12 @@ class RemoteBuilder {
|
||||||
const lfsDirectory = `${this.repoPathFull}/.git/lfs`;
|
const lfsDirectory = `${this.repoPathFull}/.git/lfs`;
|
||||||
const testLFSFile = `${this.projectPathFull}/Assets/LFS_Test_File.jpg`;
|
const testLFSFile = `${this.projectPathFull}/Assets/LFS_Test_File.jpg`;
|
||||||
|
|
||||||
const repo = `https://${this.buildParams.githubToken}@github.com/game-ci/unity-builder.git`;
|
const unityBuilderRepoUrl = `https://${this.buildParams.githubToken}@github.com/game-ci/unity-builder.git`;
|
||||||
const repo2 = `https://${this.buildParams.githubToken}@github.com/game-ci/steam-deploy.git`;
|
const steamDeployRepoUrl = `https://${this.buildParams.githubToken}@github.com/game-ci/steam-deploy.git`;
|
||||||
const repo3 = `https://${this.buildParams.githubToken}@github.com/${process.env.GITHUB_REPOSITORY}.git`;
|
const targetBuildRepoUrl = `https://${this.buildParams.githubToken}@github.com/${process.env.GITHUB_REPOSITORY}.git`;
|
||||||
|
|
||||||
const purgeRemoteCache = process.env.PURGE_REMOTE_BUILDER_CACHE !== undefined;
|
const purgeRemoteCache = process.env.PURGE_REMOTE_BUILDER_CACHE !== undefined;
|
||||||
const initializeSourceRepoForCaching = `${this.builderPathFull}/dist/remote-builder/cloneNoLFS.sh "${this.repoPathFull}" "${repo3}" "${testLFSFile}"`;
|
const initializeSourceRepoForCaching = `${this.builderPathFull}/dist/remote-builder/cloneNoLFS.sh "${this.repoPathFull}" "${targetBuildRepoUrl}" "${testLFSFile}"`;
|
||||||
const handleCaching = `${this.builderPathFull}/dist/remote-builder/handleCaching.sh "${cacheFolderFull}" ${this.libraryFolderFull}" "${lfsDirectory}" "${purgeRemoteCache}"`;
|
const handleCaching = `${this.builderPathFull}/dist/remote-builder/handleCaching.sh "${cacheFolderFull}" ${this.libraryFolderFull}" "${lfsDirectory}" "${purgeRemoteCache}"`;
|
||||||
await this.RemoteBuilderProviderPlatform.runBuildTask(
|
await this.RemoteBuilderProviderPlatform.runBuildTask(
|
||||||
this.buildId,
|
this.buildId,
|
||||||
|
|
@ -103,10 +103,10 @@ class RemoteBuilder {
|
||||||
#
|
#
|
||||||
echo ' '
|
echo ' '
|
||||||
echo 'Cloning utility repositories for remote builder'
|
echo 'Cloning utility repositories for remote builder'
|
||||||
git clone -q --branch "remote-builder/unified-providers" ${repo} ${this.builderPathFull}
|
git clone -q --branch "remote-builder/unified-providers" ${unityBuilderRepoUrl} ${this.builderPathFull}
|
||||||
echo 'Cloned ${repo}'
|
echo 'Cloned ${unityBuilderRepoUrl}'
|
||||||
git clone -q ${repo2} ${this.steamPathFull}
|
git clone -q ${steamDeployRepoUrl} ${this.steamPathFull}
|
||||||
echo 'Cloned ${repo2}'
|
echo 'Cloned ${steamDeployRepoUrl}'
|
||||||
#
|
#
|
||||||
echo ' '
|
echo ' '
|
||||||
echo 'Initializing source repository for cloning with caching of LFS files'
|
echo 'Initializing source repository for cloning with caching of LFS files'
|
||||||
|
|
@ -115,7 +115,7 @@ class RemoteBuilder {
|
||||||
${process.env.DEBUG ? '#' : ''}echo ' '
|
${process.env.DEBUG ? '#' : ''}echo ' '
|
||||||
${process.env.DEBUG ? '#' : ''}echo 'Large File before LFS caching and pull'
|
${process.env.DEBUG ? '#' : ''}echo 'Large File before LFS caching and pull'
|
||||||
${process.env.DEBUG ? '#' : ''}ls -alh "${lfsDirectory}"
|
${process.env.DEBUG ? '#' : ''}ls -alh "${lfsDirectory}"
|
||||||
echo ' '
|
${process.env.DEBUG ? '#' : ''}echo ' '
|
||||||
echo 'Source repository initialized'
|
echo 'Source repository initialized'
|
||||||
echo ' '
|
echo ' '
|
||||||
echo 'Checking cache for the Unity project Library and git LFS files'
|
echo 'Checking cache for the Unity project Library and git LFS files'
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue