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/496/head
Frostebite 2023-03-06 16:14:02 +00:00
parent cecb7bf6ae
commit 2024395e06
4 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dist/index.js generated vendored
View File

@ -1088,11 +1088,6 @@ class CloudRunner {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
yield CloudRunner.setup(buildParameters); yield CloudRunner.setup(buildParameters);
try { try {
if (!CloudRunner.buildParameters.isCliMode)
core.startGroup('Setup shared cloud runner resources');
yield CloudRunner.Provider.setupWorkflow(CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters, CloudRunner.buildParameters.branch, CloudRunner.defaultSecrets);
if (!CloudRunner.buildParameters.isCliMode)
core.endGroup();
if (buildParameters.retainWorkspace) { if (buildParameters.retainWorkspace) {
CloudRunner.lockedWorkspace = shared_workspace_locking_1.default.NewWorkspaceName(); CloudRunner.lockedWorkspace = shared_workspace_locking_1.default.NewWorkspaceName();
const result = yield shared_workspace_locking_1.default.GetOrCreateLockedWorkspace(CloudRunner.lockedWorkspace, CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters); const result = yield shared_workspace_locking_1.default.GetOrCreateLockedWorkspace(CloudRunner.lockedWorkspace, CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters);
@ -1109,6 +1104,11 @@ class CloudRunner {
CloudRunner.lockedWorkspace = undefined; CloudRunner.lockedWorkspace = undefined;
} }
} }
if (!CloudRunner.buildParameters.isCliMode)
core.startGroup('Setup shared cloud runner resources');
yield CloudRunner.Provider.setupWorkflow(CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters, CloudRunner.buildParameters.branch, CloudRunner.defaultSecrets);
if (!CloudRunner.buildParameters.isCliMode)
core.endGroup();
const content = Object.assign({}, CloudRunner.buildParameters); const content = Object.assign({}, CloudRunner.buildParameters);
content.gitPrivateToken = ``; content.gitPrivateToken = ``;
content.unitySerial = ``; content.unitySerial = ``;
@ -5762,13 +5762,18 @@ class SharedWorkspaceLocking {
} }
static DoesCacheKeyTopLevelExist(buildParametersContext) { static DoesCacheKeyTopLevelExist(buildParametersContext) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const rootLines = yield SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceBucketRoot}`); try {
const lockFolderExists = rootLines.map((x) => x.replace(`/`, ``)).includes(`locks`); const rootLines = yield SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceBucketRoot}`);
if (lockFolderExists) { const lockFolderExists = rootLines.map((x) => x.replace(`/`, ``)).includes(`locks`);
const lines = yield SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}`); if (lockFolderExists) {
return lines.map((x) => x.replace(`/`, ``)).includes(buildParametersContext.cacheKey); const lines = yield SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}`);
return lines.map((x) => x.replace(`/`, ``)).includes(buildParametersContext.cacheKey);
}
else {
return false;
}
} }
else { catch (_a) {
return false; return false;
} }
}); });

2
dist/index.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

16
src/model/cloud-runner/cloud-runner.ts
View File

@ -83,14 +83,6 @@ class CloudRunner {
static async run(buildParameters: BuildParameters, baseImage: string) { static async run(buildParameters: BuildParameters, baseImage: string) {
await CloudRunner.setup(buildParameters); await CloudRunner.setup(buildParameters);
try { try {
if (!CloudRunner.buildParameters.isCliMode) core.startGroup('Setup shared cloud runner resources');
await CloudRunner.Provider.setupWorkflow(
CloudRunner.buildParameters.buildGuid,
CloudRunner.buildParameters,
CloudRunner.buildParameters.branch,
CloudRunner.defaultSecrets,
);
if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
if (buildParameters.retainWorkspace) { if (buildParameters.retainWorkspace) {
CloudRunner.lockedWorkspace = SharedWorkspaceLocking.NewWorkspaceName(); CloudRunner.lockedWorkspace = SharedWorkspaceLocking.NewWorkspaceName();
@ -112,6 +104,14 @@ class CloudRunner {
CloudRunner.lockedWorkspace = undefined; CloudRunner.lockedWorkspace = undefined;
} }
} }
if (!CloudRunner.buildParameters.isCliMode) core.startGroup('Setup shared cloud runner resources');
await CloudRunner.Provider.setupWorkflow(
CloudRunner.buildParameters.buildGuid,
CloudRunner.buildParameters,
CloudRunner.buildParameters.branch,
CloudRunner.defaultSecrets,
);
if (!CloudRunner.buildParameters.isCliMode) core.endGroup();
const content = { ...CloudRunner.buildParameters }; const content = { ...CloudRunner.buildParameters };
content.gitPrivateToken = ``; content.gitPrivateToken = ``;
content.unitySerial = ``; content.unitySerial = ``;

18
src/model/cloud-runner/services/shared-workspace-locking.ts
View File

@ -26,14 +26,20 @@ export class SharedWorkspaceLocking {
.map((x) => x.split(`_`)[1]); .map((x) => x.split(`_`)[1]);
} }
public static async DoesCacheKeyTopLevelExist(buildParametersContext: BuildParameters) { public static async DoesCacheKeyTopLevelExist(buildParametersContext: BuildParameters) {
const rootLines = await SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceBucketRoot}`); try {
const lockFolderExists = rootLines.map((x) => x.replace(`/`, ``)).includes(`locks`); const rootLines = await SharedWorkspaceLocking.ReadLines(
`aws s3 ls ${SharedWorkspaceLocking.workspaceBucketRoot}`,
);
const lockFolderExists = rootLines.map((x) => x.replace(`/`, ``)).includes(`locks`);
if (lockFolderExists) { if (lockFolderExists) {
const lines = await SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}`); const lines = await SharedWorkspaceLocking.ReadLines(`aws s3 ls ${SharedWorkspaceLocking.workspaceRoot}`);
return lines.map((x) => x.replace(`/`, ``)).includes(buildParametersContext.cacheKey); return lines.map((x) => x.replace(`/`, ``)).includes(buildParametersContext.cacheKey);
} else { } else {
return false;
}
} catch {
return false; return false;
} }
} }