Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
frostebite committed Jan 11, 2024
1 parent a6f8859 commit c13079a
Show file tree
Hide file tree
Showing 10 changed files with 63 additions and 13 deletions.
27 changes: 24 additions & 3 deletions dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/model/cli/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export class Cli {
const buildParameter = await BuildParameters.create();
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`)
Expand All @@ -118,7 +118,7 @@ export class Cli {
const baseImage = new ImageTag(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`)
Expand Down
3 changes: 2 additions & 1 deletion src/model/cloud-runner/cloud-runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import LocalDockerCloudRunner from './providers/docker';
import GitHub from '../github';
import SharedWorkspaceLocking from './services/core/shared-workspace-locking';
import { FollowLogStreamService } from './services/core/follow-log-stream-service';
import CloudRunnerResult from './services/core/cloud-runner-result';

class CloudRunner {
public static Provider: ProviderInterface;
Expand Down Expand Up @@ -159,7 +160,7 @@ class CloudRunner {
CloudRunner.Provider.garbageCollect(``, true, buildParameters.garbageMaxAge, true, true);
}

return output;
return new CloudRunnerResult(buildParameters, output, true, true, false);
} catch (error: any) {
CloudRunnerLogger.log(JSON.stringify(error, undefined, 4));
await GitHub.updateGitHubCheck(
Expand Down
24 changes: 24 additions & 0 deletions src/model/cloud-runner/services/core/cloud-runner-result.ts
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ describe('Cloud Runner Sync Environments', () => {
}

// Run the job
const file = await CloudRunner.run(buildParameter, baseImage.toString());
const file = (await CloudRunner.run(buildParameter, baseImage.toString())).BuildResults;

// Assert results
// expect(file).toContain(JSON.stringify(buildParameter));
Expand Down
3 changes: 2 additions & 1 deletion src/model/cloud-runner/tests/cloud-runner-hooks.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ commands: echo "test"`;
};
const buildParameter2 = await CreateParameters(overrides);
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`);

const buildContainsBuildSucceeded = results2.includes('Build succeeded');
Expand Down
3 changes: 2 additions & 1 deletion src/model/cloud-runner/tests/cloud-runner-s3-steps.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ describe('Cloud Runner pre-built S3 steps', () => {
};
const buildParameter2 = await CreateParameters(overrides);
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`);

const build2ContainsBuildSucceeded = results2.includes('Build succeeded');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ describe('Cloud Runner Caching', () => {

buildParameter2.cacheKey = buildParameter.cacheKey;
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`);

const build2ContainsCacheKey = results2.includes(buildParameter.cacheKey);
Expand All @@ -78,7 +79,7 @@ describe('Cloud Runner Caching', () => {

expect(build2ContainsCacheKey).toBeTruthy();
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(build2NotContainsZeroLibraryCacheFilesMessage).toBeTruthy();
expect(build2NotContainsZeroLFSCacheFilesMessage).toBeTruthy();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ describe('Cloud Runner Retain Workspace', () => {

buildParameter2.cacheKey = buildParameter.cacheKey;
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`);

const build2ContainsCacheKey = results2.includes(buildParameter.cacheKey);
Expand Down

0 comments on commit c13079a

Please sign in to comment.