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 reversed caching direction of cache-push

pull/353/head
Frostebite 2022-04-06 23:01:08 +01:00
parent 86e4c7c856
commit 412578be66
6 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/cloud-runner-k8s-pipeline.yml vendored
View File

@ -104,8 +104,8 @@ jobs:
aws s3 ls aws s3 ls
aws s3 ls game-ci-test-storage aws s3 ls game-ci-test-storage
ls /data/cache/$BRANCH ls /data/cache/$BRANCH
echo "/data/cache/$BRANCH/build-$BUILD_GUID.zip s3://game-ci-test-storage/$BRANCH/$BUILD_FILE" echo "/data/cache/build/$BRANCH/build-$BUILD_GUID.zip s3://game-ci-test-storage/$BRANCH/$BUILD_FILE"
aws s3 cp /data/cache/$BRANCH/build-$BUILD_GUID.zip s3://game-ci-test-storage/$BRANCH/build-$BUILD_GUID.zip aws s3 cp /data/cache/build/$BRANCH/build-$BUILD_GUID.zip s3://game-ci-test-storage/$BRANCH/build-$BUILD_GUID.zip
secrets: secrets:
- name: awsAccessKeyId - name: awsAccessKeyId
value: ${{ secrets.AWS_ACCESS_KEY_ID }} value: ${{ secrets.AWS_ACCESS_KEY_ID }}

12
dist/index.js vendored
View File

@ -587,7 +587,7 @@ class CLI {
`); `);
__1.CloudRunner.buildParameters = buildParameter; __1.CloudRunner.buildParameters = buildParameter;
cloud_runner_logger_1.default.log(`${CLI.options['cachePushFrom']} ${CLI.options['cachePushTo']} ${CLI.options['artifactName']}`); cloud_runner_logger_1.default.log(`${CLI.options['cachePushFrom']} ${CLI.options['cachePushTo']} ${CLI.options['artifactName']}`);
yield caching_1.Caching.PushToCache(CLI.options['cachePushFrom'], CLI.options['cachePushTo'], CLI.options['artifactName']); yield caching_1.Caching.PushToCache(CLI.options['cachePushTo'], CLI.options['cachePushFrom'], CLI.options['artifactName']);
} }
catch (error) { catch (error) {
cloud_runner_logger_1.default.log(`${error}`); cloud_runner_logger_1.default.log(`${error}`);
@ -1010,18 +1010,12 @@ class SetupCloudRunnerRepository {
} }
static pullLatestLFS() { static pullLatestLFS() {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
if (cloud_runner_1.default.buildParameters.cloudRunnerIntegrationTests) {
yield cloud_runner_system_1.CloudRunnerSystem.Run(`ls -lh ${cloud_runner_folders_1.CloudRunnerFolders.lfsDirectoryFull}/..`);
}
process.chdir(cloud_runner_folders_1.CloudRunnerFolders.repoPathFull); process.chdir(cloud_runner_folders_1.CloudRunnerFolders.repoPathFull);
yield cloud_runner_system_1.CloudRunnerSystem.Run(`git config --global filter.lfs.smudge "git-lfs smudge -- %f"`); yield cloud_runner_system_1.CloudRunnerSystem.Run(`git config --global filter.lfs.smudge "git-lfs smudge -- %f"`);
yield cloud_runner_system_1.CloudRunnerSystem.Run(`git config --global filter.lfs.process "git-lfs filter-process"`); yield cloud_runner_system_1.CloudRunnerSystem.Run(`git config --global filter.lfs.process "git-lfs filter-process"`);
yield cloud_runner_system_1.CloudRunnerSystem.Run(`git lfs pull`); yield cloud_runner_system_1.CloudRunnerSystem.Run(`git lfs pull`);
remote_client_logger_1.RemoteClientLogger.log(`pulled latest LFS files`); remote_client_logger_1.RemoteClientLogger.log(`pulled latest LFS files`);
console_1.assert(fs_1.default.existsSync(cloud_runner_folders_1.CloudRunnerFolders.lfsDirectoryFull)); console_1.assert(fs_1.default.existsSync(cloud_runner_folders_1.CloudRunnerFolders.lfsDirectoryFull));
if (cloud_runner_1.default.buildParameters.cloudRunnerIntegrationTests) {
yield cloud_runner_system_1.CloudRunnerSystem.Run(`ls -lh ${cloud_runner_folders_1.CloudRunnerFolders.lfsDirectoryFull}/..`);
}
}); });
} }
} }
@ -1888,13 +1882,13 @@ class CloudRunner {
CloudRunner.setup(buildParameters); CloudRunner.setup(buildParameters);
try { try {
if (!CloudRunner.buildParameters.cliMode) if (!CloudRunner.buildParameters.cliMode)
core.startGroup('Setup remote runner'); core.startGroup('Setup shared cloud runner resources');
yield CloudRunner.CloudRunnerProviderPlatform.setupSharedResources(CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters, CloudRunner.buildParameters.branch, CloudRunner.defaultSecrets); yield CloudRunner.CloudRunnerProviderPlatform.setupSharedResources(CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters, CloudRunner.buildParameters.branch, CloudRunner.defaultSecrets);
if (!CloudRunner.buildParameters.cliMode) if (!CloudRunner.buildParameters.cliMode)
core.endGroup(); core.endGroup();
const output = yield new workflow_composition_root_1.WorkflowCompositionRoot().run(new cloud_runner_step_state_1.CloudRunnerStepState(baseImage, CloudRunner.cloudRunnerEnvironmentVariables, CloudRunner.defaultSecrets)); const output = yield new workflow_composition_root_1.WorkflowCompositionRoot().run(new cloud_runner_step_state_1.CloudRunnerStepState(baseImage, CloudRunner.cloudRunnerEnvironmentVariables, CloudRunner.defaultSecrets));
if (!CloudRunner.buildParameters.cliMode) if (!CloudRunner.buildParameters.cliMode)
core.startGroup('Cleanup'); core.startGroup('Cleanup shared cloud runner resources');
yield CloudRunner.CloudRunnerProviderPlatform.cleanupSharedResources(CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters, CloudRunner.buildParameters.branch, CloudRunner.defaultSecrets); yield CloudRunner.CloudRunnerProviderPlatform.cleanupSharedResources(CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters, CloudRunner.buildParameters.branch, CloudRunner.defaultSecrets);
cloud_runner_logger_1.default.log(`Cleanup complete`); cloud_runner_logger_1.default.log(`Cleanup complete`);
if (!CloudRunner.buildParameters.cliMode) if (!CloudRunner.buildParameters.cliMode)

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
src/model/cli/cli.ts
View File

@ -107,7 +107,7 @@ export class CLI {
CloudRunnerLogger.log( CloudRunnerLogger.log(
`${CLI.options['cachePushFrom']} ${CLI.options['cachePushTo']} ${CLI.options['artifactName']}`, `${CLI.options['cachePushFrom']} ${CLI.options['cachePushTo']} ${CLI.options['artifactName']}`,
); );
await Caching.PushToCache(CLI.options['cachePushFrom'], CLI.options['cachePushTo'], CLI.options['artifactName']); await Caching.PushToCache(CLI.options['cachePushTo'], CLI.options['cachePushFrom'], CLI.options['artifactName']);
} catch (error: any) { } catch (error: any) {
CloudRunnerLogger.log(`${error}`); CloudRunnerLogger.log(`${error}`);
} }

7
src/model/cli/remote-client/setup-cloud-runner-repository.ts
View File

@ -74,18 +74,11 @@ export class SetupCloudRunnerRepository {
} }
private static async pullLatestLFS() { private static async pullLatestLFS() {
if (CloudRunner.buildParameters.cloudRunnerIntegrationTests) {
await CloudRunnerSystem.Run(`ls -lh ${CloudRunnerFolders.lfsDirectoryFull}/..`);
}
process.chdir(CloudRunnerFolders.repoPathFull); process.chdir(CloudRunnerFolders.repoPathFull);
await CloudRunnerSystem.Run(`git config --global filter.lfs.smudge "git-lfs smudge -- %f"`); await CloudRunnerSystem.Run(`git config --global filter.lfs.smudge "git-lfs smudge -- %f"`);
await CloudRunnerSystem.Run(`git config --global filter.lfs.process "git-lfs filter-process"`); await CloudRunnerSystem.Run(`git config --global filter.lfs.process "git-lfs filter-process"`);
await CloudRunnerSystem.Run(`git lfs pull`); await CloudRunnerSystem.Run(`git lfs pull`);
RemoteClientLogger.log(`pulled latest LFS files`); RemoteClientLogger.log(`pulled latest LFS files`);
assert(fs.existsSync(CloudRunnerFolders.lfsDirectoryFull)); assert(fs.existsSync(CloudRunnerFolders.lfsDirectoryFull));
if (CloudRunner.buildParameters.cloudRunnerIntegrationTests) {
await CloudRunnerSystem.Run(`ls -lh ${CloudRunnerFolders.lfsDirectoryFull}/..`);
}
} }
} }

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

@ -56,7 +56,7 @@ class CloudRunner {
static async run(buildParameters: BuildParameters, baseImage: string) { static async run(buildParameters: BuildParameters, baseImage: string) {
CloudRunner.setup(buildParameters); CloudRunner.setup(buildParameters);
try { try {
if (!CloudRunner.buildParameters.cliMode) core.startGroup('Setup remote runner'); if (!CloudRunner.buildParameters.cliMode) core.startGroup('Setup shared cloud runner resources');
await CloudRunner.CloudRunnerProviderPlatform.setupSharedResources( await CloudRunner.CloudRunnerProviderPlatform.setupSharedResources(
CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters.buildGuid,
CloudRunner.buildParameters, CloudRunner.buildParameters,
@ -67,7 +67,7 @@ class CloudRunner {
const output = await new WorkflowCompositionRoot().run( const output = await new WorkflowCompositionRoot().run(
new CloudRunnerStepState(baseImage, CloudRunner.cloudRunnerEnvironmentVariables, CloudRunner.defaultSecrets), new CloudRunnerStepState(baseImage, CloudRunner.cloudRunnerEnvironmentVariables, CloudRunner.defaultSecrets),
); );
if (!CloudRunner.buildParameters.cliMode) core.startGroup('Cleanup'); if (!CloudRunner.buildParameters.cliMode) core.startGroup('Cleanup shared cloud runner resources');
await CloudRunner.CloudRunnerProviderPlatform.cleanupSharedResources( await CloudRunner.CloudRunnerProviderPlatform.cleanupSharedResources(
CloudRunner.buildParameters.buildGuid, CloudRunner.buildParameters.buildGuid,
CloudRunner.buildParameters, CloudRunner.buildParameters,