fix
parent
a6f8859c70
commit
c13079a14e
|
|
@ -632,13 +632,13 @@ class Cli {
|
||||||
static async CLIBuild() {
|
static async CLIBuild() {
|
||||||
const buildParameter = await __1.BuildParameters.create();
|
const buildParameter = await __1.BuildParameters.create();
|
||||||
const baseImage = new __1.ImageTag(buildParameter);
|
const baseImage = new __1.ImageTag(buildParameter);
|
||||||
return await __1.CloudRunner.run(buildParameter, baseImage.toString());
|
return (await __1.CloudRunner.run(buildParameter, baseImage.toString())).BuildResults;
|
||||||
}
|
}
|
||||||
static async asyncronousWorkflow() {
|
static async asyncronousWorkflow() {
|
||||||
const buildParameter = await __1.BuildParameters.create();
|
const buildParameter = await __1.BuildParameters.create();
|
||||||
const baseImage = new __1.ImageTag(buildParameter);
|
const baseImage = new __1.ImageTag(buildParameter);
|
||||||
await __1.CloudRunner.setup(buildParameter);
|
await __1.CloudRunner.setup(buildParameter);
|
||||||
return await __1.CloudRunner.run(buildParameter, baseImage.toString());
|
return (await __1.CloudRunner.run(buildParameter, baseImage.toString())).BuildResults;
|
||||||
}
|
}
|
||||||
static async checksUpdate() {
|
static async checksUpdate() {
|
||||||
const buildParameter = await __1.BuildParameters.create();
|
const buildParameter = await __1.BuildParameters.create();
|
||||||
|
|
@ -751,6 +751,7 @@ const docker_1 = __importDefault(__nccwpck_require__(42802));
|
||||||
const github_1 = __importDefault(__nccwpck_require__(39789));
|
const github_1 = __importDefault(__nccwpck_require__(39789));
|
||||||
const shared_workspace_locking_1 = __importDefault(__nccwpck_require__(71372));
|
const shared_workspace_locking_1 = __importDefault(__nccwpck_require__(71372));
|
||||||
const follow_log_stream_service_1 = __nccwpck_require__(40266);
|
const follow_log_stream_service_1 = __nccwpck_require__(40266);
|
||||||
|
const cloud_runner_result_1 = __importDefault(__nccwpck_require__(69567));
|
||||||
class CloudRunner {
|
class CloudRunner {
|
||||||
static get isCloudRunnerEnvironment() {
|
static get isCloudRunnerEnvironment() {
|
||||||
return process.env[`GITHUB_ACTIONS`] !== `true`;
|
return process.env[`GITHUB_ACTIONS`] !== `true`;
|
||||||
|
|
@ -847,7 +848,7 @@ class CloudRunner {
|
||||||
if (buildParameters.constantGarbageCollection) {
|
if (buildParameters.constantGarbageCollection) {
|
||||||
CloudRunner.Provider.garbageCollect(``, true, buildParameters.garbageMaxAge, true, true);
|
CloudRunner.Provider.garbageCollect(``, true, buildParameters.garbageMaxAge, true, true);
|
||||||
}
|
}
|
||||||
return output;
|
return new cloud_runner_result_1.default(buildParameters, output, true, true, false);
|
||||||
}
|
}
|
||||||
catch (error) {
|
catch (error) {
|
||||||
cloud_runner_logger_1.default.log(JSON.stringify(error, undefined, 4));
|
cloud_runner_logger_1.default.log(JSON.stringify(error, undefined, 4));
|
||||||
|
|
@ -4844,6 +4845,26 @@ class CloudRunnerLogger {
|
||||||
exports["default"] = CloudRunnerLogger;
|
exports["default"] = CloudRunnerLogger;
|
||||||
|
|
||||||
|
|
||||||
|
/***/ }),
|
||||||
|
|
||||||
|
/***/ 69567:
|
||||||
|
/***/ ((__unused_webpack_module, exports) => {
|
||||||
|
|
||||||
|
"use strict";
|
||||||
|
|
||||||
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
||||||
|
class CloudRunnerResult {
|
||||||
|
constructor(buildParameters, buildResults, buildSucceeded, buildFinished, libraryCacheUsed) {
|
||||||
|
this.BuildParameters = buildParameters;
|
||||||
|
this.BuildResults = buildResults;
|
||||||
|
this.BuildSucceeded = buildSucceeded;
|
||||||
|
this.BuildFinished = buildFinished;
|
||||||
|
this.LibraryCacheUsed = libraryCacheUsed;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
exports["default"] = CloudRunnerResult;
|
||||||
|
|
||||||
|
|
||||||
/***/ }),
|
/***/ }),
|
||||||
|
|
||||||
/***/ 4197:
|
/***/ 4197:
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -109,7 +109,7 @@ export class Cli {
|
||||||
const buildParameter = await BuildParameters.create();
|
const buildParameter = await BuildParameters.create();
|
||||||
const baseImage = new ImageTag(buildParameter);
|
const baseImage = new ImageTag(buildParameter);
|
||||||
|
|
||||||
return await CloudRunner.run(buildParameter, baseImage.toString());
|
return (await CloudRunner.run(buildParameter, baseImage.toString())).BuildResults;
|
||||||
}
|
}
|
||||||
|
|
||||||
@CliFunction(`async-workflow`, `runs a cloud runner build`)
|
@CliFunction(`async-workflow`, `runs a cloud runner build`)
|
||||||
|
|
@ -118,7 +118,7 @@ export class Cli {
|
||||||
const baseImage = new ImageTag(buildParameter);
|
const baseImage = new ImageTag(buildParameter);
|
||||||
await CloudRunner.setup(buildParameter);
|
await CloudRunner.setup(buildParameter);
|
||||||
|
|
||||||
return await CloudRunner.run(buildParameter, baseImage.toString());
|
return (await CloudRunner.run(buildParameter, baseImage.toString())).BuildResults;
|
||||||
}
|
}
|
||||||
|
|
||||||
@CliFunction(`checks-update`, `runs a cloud runner build`)
|
@CliFunction(`checks-update`, `runs a cloud runner build`)
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ import LocalDockerCloudRunner from './providers/docker';
|
||||||
import GitHub from '../github';
|
import GitHub from '../github';
|
||||||
import SharedWorkspaceLocking from './services/core/shared-workspace-locking';
|
import SharedWorkspaceLocking from './services/core/shared-workspace-locking';
|
||||||
import { FollowLogStreamService } from './services/core/follow-log-stream-service';
|
import { FollowLogStreamService } from './services/core/follow-log-stream-service';
|
||||||
|
import CloudRunnerResult from './services/core/cloud-runner-result';
|
||||||
|
|
||||||
class CloudRunner {
|
class CloudRunner {
|
||||||
public static Provider: ProviderInterface;
|
public static Provider: ProviderInterface;
|
||||||
|
|
@ -159,7 +160,7 @@ class CloudRunner {
|
||||||
CloudRunner.Provider.garbageCollect(``, true, buildParameters.garbageMaxAge, true, true);
|
CloudRunner.Provider.garbageCollect(``, true, buildParameters.garbageMaxAge, true, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
return output;
|
return new CloudRunnerResult(buildParameters, output, true, true, false);
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
CloudRunnerLogger.log(JSON.stringify(error, undefined, 4));
|
CloudRunnerLogger.log(JSON.stringify(error, undefined, 4));
|
||||||
await GitHub.updateGitHubCheck(
|
await GitHub.updateGitHubCheck(
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,24 @@
|
||||||
|
import BuildParameters from '../../../build-parameters';
|
||||||
|
|
||||||
|
class CloudRunnerResult {
|
||||||
|
public BuildParameters: BuildParameters;
|
||||||
|
public BuildResults: string;
|
||||||
|
public BuildSucceeded: boolean;
|
||||||
|
public BuildFinished: boolean;
|
||||||
|
public LibraryCacheUsed: boolean;
|
||||||
|
|
||||||
|
public constructor(
|
||||||
|
buildParameters: BuildParameters,
|
||||||
|
buildResults: string,
|
||||||
|
buildSucceeded: boolean,
|
||||||
|
buildFinished: boolean,
|
||||||
|
libraryCacheUsed: boolean,
|
||||||
|
) {
|
||||||
|
this.BuildParameters = buildParameters;
|
||||||
|
this.BuildResults = buildResults;
|
||||||
|
this.BuildSucceeded = buildSucceeded;
|
||||||
|
this.BuildFinished = buildFinished;
|
||||||
|
this.LibraryCacheUsed = libraryCacheUsed;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
export default CloudRunnerResult;
|
||||||
|
|
@ -50,7 +50,7 @@ describe('Cloud Runner Sync Environments', () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Run the job
|
// Run the job
|
||||||
const file = await CloudRunner.run(buildParameter, baseImage.toString());
|
const file = (await CloudRunner.run(buildParameter, baseImage.toString())).BuildResults;
|
||||||
|
|
||||||
// Assert results
|
// Assert results
|
||||||
// expect(file).toContain(JSON.stringify(buildParameter));
|
// expect(file).toContain(JSON.stringify(buildParameter));
|
||||||
|
|
|
||||||
|
|
@ -97,7 +97,8 @@ commands: echo "test"`;
|
||||||
};
|
};
|
||||||
const buildParameter2 = await CreateParameters(overrides);
|
const buildParameter2 = await CreateParameters(overrides);
|
||||||
const baseImage2 = new ImageTag(buildParameter2);
|
const baseImage2 = new ImageTag(buildParameter2);
|
||||||
const results2 = await CloudRunner.run(buildParameter2, baseImage2.toString());
|
const results2Object = await CloudRunner.run(buildParameter2, baseImage2.toString());
|
||||||
|
const results2 = results2Object.BuildResults;
|
||||||
CloudRunnerLogger.log(`run 2 succeeded`);
|
CloudRunnerLogger.log(`run 2 succeeded`);
|
||||||
|
|
||||||
const buildContainsBuildSucceeded = results2.includes('Build succeeded');
|
const buildContainsBuildSucceeded = results2.includes('Build succeeded');
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,8 @@ describe('Cloud Runner pre-built S3 steps', () => {
|
||||||
};
|
};
|
||||||
const buildParameter2 = await CreateParameters(overrides);
|
const buildParameter2 = await CreateParameters(overrides);
|
||||||
const baseImage2 = new ImageTag(buildParameter2);
|
const baseImage2 = new ImageTag(buildParameter2);
|
||||||
const results2 = await CloudRunner.run(buildParameter2, baseImage2.toString());
|
const results2Object = await CloudRunner.run(buildParameter2, baseImage2.toString());
|
||||||
|
const results2 = results2Object.BuildResults;
|
||||||
CloudRunnerLogger.log(`run 2 succeeded`);
|
CloudRunnerLogger.log(`run 2 succeeded`);
|
||||||
|
|
||||||
const build2ContainsBuildSucceeded = results2.includes('Build succeeded');
|
const build2ContainsBuildSucceeded = results2.includes('Build succeeded');
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,8 @@ describe('Cloud Runner Caching', () => {
|
||||||
|
|
||||||
buildParameter2.cacheKey = buildParameter.cacheKey;
|
buildParameter2.cacheKey = buildParameter.cacheKey;
|
||||||
const baseImage2 = new ImageTag(buildParameter2);
|
const baseImage2 = new ImageTag(buildParameter2);
|
||||||
const results2 = await CloudRunner.run(buildParameter2, baseImage2.toString());
|
const results2Object = await CloudRunner.run(buildParameter2, baseImage2.toString());
|
||||||
|
const results2 = results2Object.BuildResults;
|
||||||
CloudRunnerLogger.log(`run 2 succeeded`);
|
CloudRunnerLogger.log(`run 2 succeeded`);
|
||||||
|
|
||||||
const build2ContainsCacheKey = results2.includes(buildParameter.cacheKey);
|
const build2ContainsCacheKey = results2.includes(buildParameter.cacheKey);
|
||||||
|
|
@ -78,7 +79,7 @@ describe('Cloud Runner Caching', () => {
|
||||||
|
|
||||||
expect(build2ContainsCacheKey).toBeTruthy();
|
expect(build2ContainsCacheKey).toBeTruthy();
|
||||||
expect(results2).toContain('Activation successful');
|
expect(results2).toContain('Activation successful');
|
||||||
expect(results2.split('Activation successful')[1]).toContain(libraryString);
|
expect(results2.split('Activation successful')[1]).not.toContain(libraryString);
|
||||||
expect(build2ContainsBuildSucceeded).toBeTruthy();
|
expect(build2ContainsBuildSucceeded).toBeTruthy();
|
||||||
expect(build2NotContainsZeroLibraryCacheFilesMessage).toBeTruthy();
|
expect(build2NotContainsZeroLibraryCacheFilesMessage).toBeTruthy();
|
||||||
expect(build2NotContainsZeroLFSCacheFilesMessage).toBeTruthy();
|
expect(build2NotContainsZeroLFSCacheFilesMessage).toBeTruthy();
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,8 @@ describe('Cloud Runner Retain Workspace', () => {
|
||||||
|
|
||||||
buildParameter2.cacheKey = buildParameter.cacheKey;
|
buildParameter2.cacheKey = buildParameter.cacheKey;
|
||||||
const baseImage2 = new ImageTag(buildParameter2);
|
const baseImage2 = new ImageTag(buildParameter2);
|
||||||
const results2 = await CloudRunner.run(buildParameter2, baseImage2.toString());
|
const results2Object = await CloudRunner.run(buildParameter2, baseImage2.toString());
|
||||||
|
const results2 = results2Object.BuildResults;
|
||||||
CloudRunnerLogger.log(`run 2 succeeded`);
|
CloudRunnerLogger.log(`run 2 succeeded`);
|
||||||
|
|
||||||
const build2ContainsCacheKey = results2.includes(buildParameter.cacheKey);
|
const build2ContainsCacheKey = results2.includes(buildParameter.cacheKey);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue