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

fix

pull/310/head
Frostebite 2021-12-31 16:47:41 +00:00
parent ae22ce21cb
commit 4675f797f5
4 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dist/index.js vendored
View File

@ -2635,14 +2635,11 @@ class CloudRunnerState {
return CloudRunnerState.buildParams.branch; return CloudRunnerState.buildParams.branch;
} }
static get buildPathFull() { static get buildPathFull() {
return path_1.default.join(`/`, CloudRunnerState.buildVolumeFolder, CloudRunnerState.buildParams.buildGuid); return path_1.default.join(CloudRunnerState.buildVolumeFolder, CloudRunnerState.buildParams.buildGuid);
} }
static get builderPathFull() { static get builderPathFull() {
return path_1.default.join(CloudRunnerState.buildPathFull, `builder`); return path_1.default.join(CloudRunnerState.buildPathFull, `builder`);
} }
static get steamPathFull() {
return path_1.default.join(CloudRunnerState.buildPathFull, `steam`);
}
static get repoPathFull() { static get repoPathFull() {
return path_1.default.join(CloudRunnerState.buildPathFull, CloudRunnerState.repositoryFolder); return path_1.default.join(CloudRunnerState.buildPathFull, CloudRunnerState.repositoryFolder);
} }
@ -2677,7 +2674,7 @@ class CloudRunnerState {
return `${CloudRunnerState.buildParams.githubRepo}`; return `${CloudRunnerState.buildParams.githubRepo}`;
} }
static get buildVolumeFolder() { static get buildVolumeFolder() {
return path_1.default.join('/', 'data'); return 'data';
} }
static get cacheFolder() { static get cacheFolder() {
return 'cache'; return 'cache';
@ -2811,11 +2808,10 @@ class SetupStep {
apk update -q apk update -q
apk add unzip zip git-lfs jq tree nodejs -q apk add unzip zip git-lfs jq tree nodejs -q
export GIT_DISCOVERY_ACROSS_FILESYSTEM=1 export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
mkdir -p ${cloud_runner_state_1.CloudRunnerState.builderPathFull.replace(/\//g, `\\`)} mkdir -p ${cloud_runner_state_1.CloudRunnerState.builderPathFull.replace(/\\/g, `/`)}
echo "test >> git clone -b ${cloud_runner_state_1.CloudRunnerState.branchName} ${cloud_runner_state_1.CloudRunnerState.unityBuilderRepoUrl} "${cloud_runner_state_1.CloudRunnerState.builderPathFull.replace(/\\/g, `/`)}"
git clone -b ${cloud_runner_state_1.CloudRunnerState.branchName} ${cloud_runner_state_1.CloudRunnerState.unityBuilderRepoUrl} "${cloud_runner_state_1.CloudRunnerState.builderPathFull.replace(/\//g, `\\`)}" chmod +x ${path_1.default.join(cloud_runner_state_1.CloudRunnerState.builderPathFull, 'dist', `index.js`).replace(/\\/g, `/`)}
chmod +x ${path_1.default.join(cloud_runner_state_1.CloudRunnerState.builderPathFull, 'dist', `index.js`).replace(/\//g, '\\')} node ${path_1.default.join(cloud_runner_state_1.CloudRunnerState.builderPathFull, 'dist', `index.js`).replace(/\\/g, `/`)} -m remote-cli
node ${path_1.default.join(cloud_runner_state_1.CloudRunnerState.builderPathFull, 'dist', `index.js`).replace(/\//g, '\\')} -m remote-cli
`, `/${cloud_runner_state_1.CloudRunnerState.buildVolumeFolder}`, `/${cloud_runner_state_1.CloudRunnerState.buildVolumeFolder}/`, environmentVariables, secrets); `, `/${cloud_runner_state_1.CloudRunnerState.buildVolumeFolder}`, `/${cloud_runner_state_1.CloudRunnerState.buildVolumeFolder}/`, environmentVariables, secrets);
} }
catch (error) { catch (error) {

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
src/model/cloud-runner/state/cloud-runner-state.ts
View File

@ -18,17 +18,13 @@ export class CloudRunnerState {
} }
public static get buildPathFull(): string { public static get buildPathFull(): string {
return path.join(`/`, CloudRunnerState.buildVolumeFolder, CloudRunnerState.buildParams.buildGuid); return path.join(CloudRunnerState.buildVolumeFolder, CloudRunnerState.buildParams.buildGuid);
} }
public static get builderPathFull(): string { public static get builderPathFull(): string {
return path.join(CloudRunnerState.buildPathFull, `builder`); return path.join(CloudRunnerState.buildPathFull, `builder`);
} }
public static get steamPathFull(): string {
return path.join(CloudRunnerState.buildPathFull, `steam`);
}
public static get repoPathFull(): string { public static get repoPathFull(): string {
return path.join(CloudRunnerState.buildPathFull, CloudRunnerState.repositoryFolder); return path.join(CloudRunnerState.buildPathFull, CloudRunnerState.repositoryFolder);
} }
@ -74,7 +70,7 @@ export class CloudRunnerState {
} }
public static get buildVolumeFolder() { public static get buildVolumeFolder() {
return path.join('/', 'data'); return 'data';
} }
public static get cacheFolder() { public static get cacheFolder() {

8
src/model/cloud-runner/steps/setup-step.ts
View File

@ -35,12 +35,12 @@ export class SetupStep implements StepInterface {
apk update -q apk update -q
apk add unzip zip git-lfs jq tree nodejs -q apk add unzip zip git-lfs jq tree nodejs -q
export GIT_DISCOVERY_ACROSS_FILESYSTEM=1 export GIT_DISCOVERY_ACROSS_FILESYSTEM=1
mkdir -p ${CloudRunnerState.builderPathFull.replace(/\//g, `\\`)} mkdir -p ${CloudRunnerState.builderPathFull.replace(/\\/g, `/`)}
git clone -b ${CloudRunnerState.branchName} ${ git clone -b ${CloudRunnerState.branchName} ${
CloudRunnerState.unityBuilderRepoUrl CloudRunnerState.unityBuilderRepoUrl
} "${CloudRunnerState.builderPathFull.replace(/\//g, `\\`)}" } "${CloudRunnerState.builderPathFull.replace(/\\/g, `/`)}"
chmod +x ${path.join(CloudRunnerState.builderPathFull, 'dist', `index.js`).replace(/\//g, '\\')} chmod +x ${path.join(CloudRunnerState.builderPathFull, 'dist', `index.js`).replace(/\\/g, `/`)}
node ${path.join(CloudRunnerState.builderPathFull, 'dist', `index.js`).replace(/\//g, '\\')} -m remote-cli node ${path.join(CloudRunnerState.builderPathFull, 'dist', `index.js`).replace(/\\/g, `/`)} -m remote-cli
`, `,
`/${CloudRunnerState.buildVolumeFolder}`, `/${CloudRunnerState.buildVolumeFolder}`,
`/${CloudRunnerState.buildVolumeFolder}/`, `/${CloudRunnerState.buildVolumeFolder}/`,