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

testing use of cloud runner state values in remote-cli

pull/310/head
Frostebite 2021-12-19 21:41:49 +00:00
parent b10ad0165c
commit dae249cd4a
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dist/index.js vendored
View File

@ -1994,6 +1994,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
}; };
Object.defineProperty(exports, "__esModule", ({ value: true })); Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.DownloadRepository = void 0; exports.DownloadRepository = void 0;
const cloud_runner_state_1 = __webpack_require__(70912);
const { exec } = __webpack_require__(63129); const { exec } = __webpack_require__(63129);
class DownloadRepository { class DownloadRepository {
static run() { static run() {
@ -2003,6 +2004,7 @@ class DownloadRepository {
echo "test" echo "test"
apk update -q apk update -q
apk add unzip zip git-lfs jq tree -q apk add unzip zip git-lfs jq tree -q
${cloud_runner_state_1.CloudRunnerState.cloneBuilderCommand}
`, (error, stdout, stderr) => { `, (error, stdout, stderr) => {
if (error) { if (error) {
// eslint-disable-next-line no-console // eslint-disable-next-line no-console
@ -2139,7 +2141,7 @@ class CloudRunnerState {
static setup(buildParameters) { static setup(buildParameters) {
CloudRunnerState.buildParams = buildParameters; CloudRunnerState.buildParams = buildParameters;
if (CloudRunnerState.buildGuid === undefined) { if (CloudRunnerState.buildGuid === undefined) {
CloudRunnerState.buildGuid = cloud_runner_namespace_1.default.generateBuildName(CloudRunnerState.readRunNumber(), buildParameters.platform); CloudRunnerState.buildGuid = cloud_runner_namespace_1.default.generateBuildName(CloudRunnerState.runNumber, buildParameters.platform);
} }
CloudRunnerState.setupDefaultSecrets(); CloudRunnerState.setupDefaultSecrets();
} }
@ -2245,12 +2247,12 @@ class CloudRunnerState {
static getCloneNoLFSCommand() { static getCloneNoLFSCommand() {
return `${CloudRunnerState.builderPathFull}/dist/cloud-runner/cloneNoLFS.sh "${CloudRunnerState.repoPathFull}" "${CloudRunnerState.targetBuildRepoUrl}"`; return `${CloudRunnerState.builderPathFull}/dist/cloud-runner/cloneNoLFS.sh "${CloudRunnerState.repoPathFull}" "${CloudRunnerState.targetBuildRepoUrl}"`;
} }
static getCloneBuilder() { static get cloneBuilderCommand() {
const cloneCommand = `git clone -b ${CloudRunnerState.branchName} ${CloudRunnerState.unityBuilderRepoUrl} ${CloudRunnerState.builderPathFull}`; const cloneCommand = `git clone -b ${CloudRunnerState.branchName} ${CloudRunnerState.unityBuilderRepoUrl} ${CloudRunnerState.builderPathFull}`;
cloud_runner_logger_1.default.log(cloneCommand); cloud_runner_logger_1.default.log(cloneCommand);
return cloneCommand; return cloneCommand;
} }
static readRunNumber() { static get runNumber() {
const runNumber = CloudRunnerState.buildParams.runNumber; const runNumber = CloudRunnerState.buildParams.runNumber;
if (!runNumber || runNumber === '') { if (!runNumber || runNumber === '') {
throw new Error('no run number found, exiting'); throw new Error('no run number found, exiting');
@ -2512,8 +2514,8 @@ class DownloadRepositoryStep {
# mkdir -p ${cloud_runner_state_1.CloudRunnerState.buildPathFull} # mkdir -p ${cloud_runner_state_1.CloudRunnerState.buildPathFull}
mkdir -p ${cloud_runner_state_1.CloudRunnerState.builderPathFull} mkdir -p ${cloud_runner_state_1.CloudRunnerState.builderPathFull}
# mkdir -p ${cloud_runner_state_1.CloudRunnerState.repoPathFull} # mkdir -p ${cloud_runner_state_1.CloudRunnerState.repoPathFull}
echo "${cloud_runner_state_1.CloudRunnerState.getCloneBuilder()}" echo "${cloud_runner_state_1.CloudRunnerState.cloneBuilderCommand}"
${cloud_runner_state_1.CloudRunnerState.getCloneBuilder()} ${cloud_runner_state_1.CloudRunnerState.cloneBuilderCommand}
chmod +x ${cloud_runner_state_1.CloudRunnerState.builderPathFull}/dist/index.js chmod +x ${cloud_runner_state_1.CloudRunnerState.builderPathFull}/dist/index.js
node ${cloud_runner_state_1.CloudRunnerState.builderPathFull}/dist/index.js -m remote-cli node ${cloud_runner_state_1.CloudRunnerState.builderPathFull}/dist/index.js -m remote-cli
# echo ' ' # echo ' '

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

3
src/model/cloud-runner/remote-client/remote-steps/download-repository.ts
View File

@ -1,3 +1,5 @@
import { CloudRunnerState } from '../../state/cloud-runner-state';
const { exec } = require('child_process'); const { exec } = require('child_process');
export class DownloadRepository { export class DownloadRepository {
@ -8,6 +10,7 @@ export class DownloadRepository {
echo "test" echo "test"
apk update -q apk update -q
apk add unzip zip git-lfs jq tree -q apk add unzip zip git-lfs jq tree -q
${CloudRunnerState.cloneBuilderCommand}
`, `,
(error, stdout, stderr) => { (error, stdout, stderr) => {
if (error) { if (error) {

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

@ -11,7 +11,7 @@ export class CloudRunnerState {
CloudRunnerState.buildParams = buildParameters; CloudRunnerState.buildParams = buildParameters;
if (CloudRunnerState.buildGuid === undefined) { if (CloudRunnerState.buildGuid === undefined) {
CloudRunnerState.buildGuid = CloudRunnerNamespace.generateBuildName( CloudRunnerState.buildGuid = CloudRunnerNamespace.generateBuildName(
CloudRunnerState.readRunNumber(), CloudRunnerState.runNumber,
buildParameters.platform, buildParameters.platform,
); );
} }
@ -137,13 +137,13 @@ export class CloudRunnerState {
return `${CloudRunnerState.builderPathFull}/dist/cloud-runner/cloneNoLFS.sh "${CloudRunnerState.repoPathFull}" "${CloudRunnerState.targetBuildRepoUrl}"`; return `${CloudRunnerState.builderPathFull}/dist/cloud-runner/cloneNoLFS.sh "${CloudRunnerState.repoPathFull}" "${CloudRunnerState.targetBuildRepoUrl}"`;
} }
public static getCloneBuilder() { public static get cloneBuilderCommand() {
const cloneCommand = `git clone -b ${CloudRunnerState.branchName} ${CloudRunnerState.unityBuilderRepoUrl} ${CloudRunnerState.builderPathFull}`; const cloneCommand = `git clone -b ${CloudRunnerState.branchName} ${CloudRunnerState.unityBuilderRepoUrl} ${CloudRunnerState.builderPathFull}`;
CloudRunnerLogger.log(cloneCommand); CloudRunnerLogger.log(cloneCommand);
return cloneCommand; return cloneCommand;
} }
public static readRunNumber() { public static get runNumber() {
const runNumber = CloudRunnerState.buildParams.runNumber; const runNumber = CloudRunnerState.buildParams.runNumber;
if (!runNumber || runNumber === '') { if (!runNumber || runNumber === '') {
throw new Error('no run number found, exiting'); throw new Error('no run number found, exiting');

4
src/model/cloud-runner/steps/download-repository-step.ts
View File

@ -37,8 +37,8 @@ export class DownloadRepositoryStep implements StepInterface {
# mkdir -p ${CloudRunnerState.buildPathFull} # mkdir -p ${CloudRunnerState.buildPathFull}
mkdir -p ${CloudRunnerState.builderPathFull} mkdir -p ${CloudRunnerState.builderPathFull}
# mkdir -p ${CloudRunnerState.repoPathFull} # mkdir -p ${CloudRunnerState.repoPathFull}
echo "${CloudRunnerState.getCloneBuilder()}" echo "${CloudRunnerState.cloneBuilderCommand}"
${CloudRunnerState.getCloneBuilder()} ${CloudRunnerState.cloneBuilderCommand}
chmod +x ${CloudRunnerState.builderPathFull}/dist/index.js chmod +x ${CloudRunnerState.builderPathFull}/dist/index.js
node ${CloudRunnerState.builderPathFull}/dist/index.js -m remote-cli node ${CloudRunnerState.builderPathFull}/dist/index.js -m remote-cli
# echo ' ' # echo ' '