fix(local-docker): guard apt-get/tree in debug hook; mirror /data/cache back to for tests

pull/729/head
Frostebite 2025-09-05 15:09:44 +01:00
parent 16d1156834
commit 9e6d69f9f5
4 changed files with 17 additions and 7 deletions

11
dist/index.js generated vendored
View File

@ -5779,9 +5779,9 @@ class ContainerHookService {
image: ubuntu
hook: after
commands: |
apt-get update > /dev/null
${cloud_runner_options_1.default.cloudRunnerDebug ? `apt-get install -y tree > /dev/null` : `#`}
${cloud_runner_options_1.default.cloudRunnerDebug ? `tree -L 3 /data/cache` : `#`}
apt-get update > /dev/null || true
${cloud_runner_options_1.default.cloudRunnerDebug ? `apt-get install -y tree > /dev/null || true` : `#`}
${cloud_runner_options_1.default.cloudRunnerDebug ? `tree -L 3 /data/cache || true` : `#`}
secrets:
- name: awsAccessKeyId
value: ${process.env.AWS_ACCESS_KEY_ID || ``}
@ -6111,6 +6111,11 @@ echo "CACHE_KEY=$CACHE_KEY"`;
tar -cf "/data/cache/$CACHE_KEY/build/build-$BUILD_GUID.tar" --files-from /dev/null || touch "/data/cache/$CACHE_KEY/build/build-$BUILD_GUID.tar"
fi
node ${builderPath} -m remote-cli-post-build || true
# Mirror cache back into workspace for test assertions
mkdir -p "$GITHUB_WORKSPACE/cloud-runner-cache/cache/$CACHE_KEY/Library"
mkdir -p "$GITHUB_WORKSPACE/cloud-runner-cache/cache/$CACHE_KEY/build"
cp -a "/data/cache/$CACHE_KEY/Library/." "$GITHUB_WORKSPACE/cloud-runner-cache/cache/$CACHE_KEY/Library/" || true
cp -a "/data/cache/$CACHE_KEY/build/." "$GITHUB_WORKSPACE/cloud-runner-cache/cache/$CACHE_KEY/build/" || true
echo "end of cloud runner job"`;
}
return `

2
dist/index.js.map generated vendored

File diff suppressed because one or more lines are too long

View File

@ -173,9 +173,9 @@ export class ContainerHookService {
image: ubuntu
hook: after
commands: |
apt-get update > /dev/null
${CloudRunnerOptions.cloudRunnerDebug ? `apt-get install -y tree > /dev/null` : `#`}
${CloudRunnerOptions.cloudRunnerDebug ? `tree -L 3 /data/cache` : `#`}
apt-get update > /dev/null || true
${CloudRunnerOptions.cloudRunnerDebug ? `apt-get install -y tree > /dev/null || true` : `#`}
${CloudRunnerOptions.cloudRunnerDebug ? `tree -L 3 /data/cache || true` : `#`}
secrets:
- name: awsAccessKeyId
value: ${process.env.AWS_ACCESS_KEY_ID || ``}

View File

@ -143,6 +143,11 @@ echo "CACHE_KEY=$CACHE_KEY"`;
tar -cf "/data/cache/$CACHE_KEY/build/build-$BUILD_GUID.tar" --files-from /dev/null || touch "/data/cache/$CACHE_KEY/build/build-$BUILD_GUID.tar"
fi
node ${builderPath} -m remote-cli-post-build || true
# Mirror cache back into workspace for test assertions
mkdir -p "$GITHUB_WORKSPACE/cloud-runner-cache/cache/$CACHE_KEY/Library"
mkdir -p "$GITHUB_WORKSPACE/cloud-runner-cache/cache/$CACHE_KEY/build"
cp -a "/data/cache/$CACHE_KEY/Library/." "$GITHUB_WORKSPACE/cloud-runner-cache/cache/$CACHE_KEY/Library/" || true
cp -a "/data/cache/$CACHE_KEY/build/." "$GITHUB_WORKSPACE/cloud-runner-cache/cache/$CACHE_KEY/build/" || true
echo "end of cloud runner job"`;
}
return `