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

pull/437/head
Frostebite 2022-10-13 23:00:18 +01:00
parent 94d6139246
commit 14de25bd18
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/index.js vendored
View File

@ -5710,10 +5710,10 @@ class Docker {
const githubWorkflow = path_1.default.join(runnerTempPath, '_github_workflow'); const githubWorkflow = path_1.default.join(runnerTempPath, '_github_workflow');
if (!fs_1.existsSync(githubWorkflow)) if (!fs_1.existsSync(githubWorkflow))
fs_1.mkdirSync(githubWorkflow); fs_1.mkdirSync(githubWorkflow);
const commandPrefix = image === `alpine` ? `/bin/sh` : `/bin/bash`;
return `docker run \ return `docker run \
--workdir /github/workspace \ --workdir /github/workspace \
--rm \ --rm \
${entrypointBash ? `--entrypoint /bin/bash` : ``} \
${image_environment_factory_1.default.getEnvVarString(parameters, additionalVariables)} \ ${image_environment_factory_1.default.getEnvVarString(parameters, additionalVariables)} \
--env UNITY_SERIAL \ --env UNITY_SERIAL \
--env GITHUB_WORKSPACE=/github/workspace \ --env GITHUB_WORKSPACE=/github/workspace \
@ -5728,7 +5728,7 @@ class Docker {
${sshAgent ? `--volume ${sshAgent}:/ssh-agent` : ''} \ ${sshAgent ? `--volume ${sshAgent}:/ssh-agent` : ''} \
${sshAgent ? '--volume /home/runner/.ssh/known_hosts:/root/.ssh/known_hosts:ro' : ''} \ ${sshAgent ? '--volume /home/runner/.ssh/known_hosts:/root/.ssh/known_hosts:ro' : ''} \
${image} \ ${image} \
${image === `alpine` ? `/bin/sh -c ` : `/bin/bash -c `} \ ${entrypointBash ? `--entrypoint ${commandPrefix} ` : `${commandPrefix} -c `} \
${overrideCommands !== '' ? overrideCommands : `/entrypoint.sh`}`; ${overrideCommands !== '' ? overrideCommands : `/entrypoint.sh`}`;
} }
static getWindowsCommand(image, parameters) { static getWindowsCommand(image, parameters) {

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
src/model/docker.ts
View File

@ -42,11 +42,11 @@ class Docker {
if (!existsSync(githubHome)) mkdirSync(githubHome); if (!existsSync(githubHome)) mkdirSync(githubHome);
const githubWorkflow = path.join(runnerTempPath, '_github_workflow'); const githubWorkflow = path.join(runnerTempPath, '_github_workflow');
if (!existsSync(githubWorkflow)) mkdirSync(githubWorkflow); if (!existsSync(githubWorkflow)) mkdirSync(githubWorkflow);
const commandPrefix = image === `alpine` ? `/bin/sh` : `/bin/bash`;
return `docker run \ return `docker run \
--workdir /github/workspace \ --workdir /github/workspace \
--rm \ --rm \
${entrypointBash ? `--entrypoint /bin/bash` : ``} \
${ImageEnvironmentFactory.getEnvVarString(parameters, additionalVariables)} \ ${ImageEnvironmentFactory.getEnvVarString(parameters, additionalVariables)} \
--env UNITY_SERIAL \ --env UNITY_SERIAL \
--env GITHUB_WORKSPACE=/github/workspace \ --env GITHUB_WORKSPACE=/github/workspace \
@ -61,7 +61,7 @@ class Docker {
${sshAgent ? `--volume ${sshAgent}:/ssh-agent` : ''} \ ${sshAgent ? `--volume ${sshAgent}:/ssh-agent` : ''} \
${sshAgent ? '--volume /home/runner/.ssh/known_hosts:/root/.ssh/known_hosts:ro' : ''} \ ${sshAgent ? '--volume /home/runner/.ssh/known_hosts:/root/.ssh/known_hosts:ro' : ''} \
${image} \ ${image} \
${image === `alpine` ? `/bin/sh -c ` : `/bin/bash -c `} \ ${entrypointBash ? `--entrypoint ${commandPrefix} ` : `${commandPrefix} -c `} \
${overrideCommands !== '' ? overrideCommands : `/entrypoint.sh`}`; ${overrideCommands !== '' ? overrideCommands : `/entrypoint.sh`}`;
} }