From 3a2aedaf9e6a988d597d2a202733007b3b74c4a9 Mon Sep 17 00:00:00 2001 From: Frostebite Date: Thu, 13 Oct 2022 16:53:46 +0100 Subject: [PATCH] Custom step file support --- src/model/cloud-runner/remote-client/index.ts | 3 +++ src/model/cloud-runner/workflows/build-automation-workflow.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/model/cloud-runner/remote-client/index.ts b/src/model/cloud-runner/remote-client/index.ts index 56d5650d..506b5013 100644 --- a/src/model/cloud-runner/remote-client/index.ts +++ b/src/model/cloud-runner/remote-client/index.ts @@ -81,6 +81,9 @@ export class RemoteClient { RemoteClientLogger.log(`Cloning the repository being built:`); await CloudRunnerSystem.Run(`git config --global filter.lfs.smudge "git-lfs smudge --skip -- %f"`); await CloudRunnerSystem.Run(`git config --global filter.lfs.process "git-lfs filter-process --skip"`); + if (!CloudRunner.buildParameters.retainWorkspace) { + await CloudRunnerSystem.Run(`rm -r ${CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.repoPathAbsolute)}`); + } await CloudRunnerSystem.Run( `git clone -q ${CloudRunnerFolders.targetBuildRepoUrl} ${path.resolve( `..`, diff --git a/src/model/cloud-runner/workflows/build-automation-workflow.ts b/src/model/cloud-runner/workflows/build-automation-workflow.ts index b7f35459..0b8427d9 100644 --- a/src/model/cloud-runner/workflows/build-automation-workflow.ts +++ b/src/model/cloud-runner/workflows/build-automation-workflow.ts @@ -116,7 +116,7 @@ export class BuildAutomationWorkflow implements WorkflowInterface { private static setupCommands(builderPath) { const commands = `mkdir -p ${CloudRunnerFolders.ToLinuxFolder( CloudRunnerFolders.builderPathAbsolute, - )} && rm -r ${CloudRunnerFolders.ToLinuxFolder(CloudRunnerFolders.repoPathAbsolute)} && git clone -q -b ${ + )} && git clone -q -b ${ CloudRunner.buildParameters.cloudRunnerBranch } ${CloudRunnerFolders.unityBuilderRepoUrl} "${CloudRunnerFolders.ToLinuxFolder( CloudRunnerFolders.builderPathAbsolute,