chore(local-docker): guard tree in setupCommands; fallback to ls -la
parent
2d7374bec4
commit
3570d40148
|
@ -6074,7 +6074,7 @@ class BuildAutomationWorkflow {
|
||||||
static setupCommands(builderPath, isContainerized) {
|
static setupCommands(builderPath, isContainerized) {
|
||||||
const commands = `mkdir -p ${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute)} && git clone -q -b ${cloud_runner_1.default.buildParameters.cloudRunnerBranch} ${cloud_runner_folders_1.CloudRunnerFolders.unityBuilderRepoUrl} "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute)}" && chmod +x ${builderPath}`;
|
const commands = `mkdir -p ${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute)} && git clone -q -b ${cloud_runner_1.default.buildParameters.cloudRunnerBranch} ${cloud_runner_folders_1.CloudRunnerFolders.unityBuilderRepoUrl} "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute)}" && chmod +x ${builderPath}`;
|
||||||
if (isContainerized) {
|
if (isContainerized) {
|
||||||
const cloneBuilderCommands = `if [ -e "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute)}" ] && [ -e "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(node_path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, `.git`))}" ] ; then echo "Builder Already Exists!" && tree ${cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute}; else ${commands} ; fi`;
|
const cloneBuilderCommands = `if [ -e "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(cloud_runner_folders_1.CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute)}" ] && [ -e "${cloud_runner_folders_1.CloudRunnerFolders.ToLinuxFolder(node_path_1.default.join(cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute, `.git`))}" ] ; then echo "Builder Already Exists!" && (command -v tree > /dev/null 2>&1 && tree ${cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute} || ls -la ${cloud_runner_folders_1.CloudRunnerFolders.builderPathAbsolute}); else ${commands} ; fi`;
|
||||||
return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
|
return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
|
||||||
${cloneBuilderCommands}
|
${cloneBuilderCommands}
|
||||||
echo "log start" >> /home/job-log.txt
|
echo "log start" >> /home/job-log.txt
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -98,9 +98,11 @@ export class BuildAutomationWorkflow implements WorkflowInterface {
|
||||||
CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute,
|
CloudRunnerFolders.uniqueCloudRunnerJobFolderAbsolute,
|
||||||
)}" ] && [ -e "${CloudRunnerFolders.ToLinuxFolder(
|
)}" ] && [ -e "${CloudRunnerFolders.ToLinuxFolder(
|
||||||
path.join(CloudRunnerFolders.builderPathAbsolute, `.git`),
|
path.join(CloudRunnerFolders.builderPathAbsolute, `.git`),
|
||||||
)}" ] ; then echo "Builder Already Exists!" && tree ${
|
)}" ] ; then echo "Builder Already Exists!" && (command -v tree > /dev/null 2>&1 && tree ${
|
||||||
CloudRunnerFolders.builderPathAbsolute
|
CloudRunnerFolders.builderPathAbsolute
|
||||||
}; else ${commands} ; fi`;
|
} || ls -la ${
|
||||||
|
CloudRunnerFolders.builderPathAbsolute
|
||||||
|
}); else ${commands} ; fi`;
|
||||||
|
|
||||||
return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
|
return `export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
|
||||||
${cloneBuilderCommands}
|
${cloneBuilderCommands}
|
||||||
|
|
Loading…
Reference in New Issue