actions/runner-container-hooks
1
0
Fork 0
mirror of https://github.com/actions/runner-container-hooks.git synced 2025-12-18 10:46:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Nikola Jokic
2025-11-28 17:48:00 +01:00
parent 4b388a89bb
commit 9da01d74f1
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
packages/k8s/src/hooks/run-script-step.ts
View File

@@ -23,25 +23,37 @@ export async function runScriptStep(
) )
const workdir = dirname(process.env.RUNNER_WORKSPACE as string) const workdir = dirname(process.env.RUNNER_WORKSPACE as string)
const containerTemp = '/__w/_temp'
const runnerTemp = `${workdir}/_temp` const runnerTemp = `${workdir}/_temp`
await execCpToPod(state.jobPod, runnerTemp, containerTemp) const containerTemp = '/__w/_temp'
const containerTempSrc = '/__w/_temp_pre'
// Stage runner temp inside container, then merge into /__w/_temp
await execCpToPod(state.jobPod, runnerTemp, containerTempSrc)
// Copy GitHub directories from temp to /github // Copy GitHub directories from temp to /github
const setupCommands = [ // Merge strategy:
'mkdir -p /github', // - Overwrite files in _runner_file_commands
'cp -r /__w/_temp/_github_home /github/home', // - Append files not already present elsewhere
'cp -r /__w/_temp/_github_workflow /github/workflow' const mergeCommands = [
'set -e',
'mkdir -p /__w/_temp /__w/_temp_pre',
'SRC=/__w/_temp_pre',
'DST=/__w/_temp',
// Overwrite _runner_file_commands
'[ -d "$SRC/_runner_file_commands" ] && mkdir -p "$DST/_runner_file_commands" && cp -a "$SRC/_runner_file_commands/." "$DST/_runner_file_commands/" || true',
// Append other files if missing
'find "$SRC" -type f ! -path "*/_runner_file_commands/*" | while read -r f; do rel=${f#"$SRC/"}; target="$DST/$rel"; dir=$(dirname "$target"); if [ ! -e "$target" ]; then mkdir -p "$dir"; cp -a "$f" "$target"; fi; done'
] ]
try { try {
await execPodStep( await execPodStep(
['sh', '-c', shlex.quote(setupCommands.join(' && '))], ['sh', '-c', shlex.quote(mergeCommands.join(' && '))],
state.jobPod, state.jobPod,
JOB_CONTAINER_NAME JOB_CONTAINER_NAME
) )
} catch (err) { } catch (err) {
core.debug(`Failed to copy GitHub directories: ${JSON.stringify(err)}`) core.debug(`Failed to merge temp directories: ${JSON.stringify(err)}`)
const message = (err as any)?.response?.body?.message || err
throw new Error(`failed to merge temp dirs: ${message}`)
} }
// Execute the entrypoint script // Execute the entrypoint script
@@ -69,11 +81,7 @@ export async function runScriptStep(
core.debug( core.debug(
`Copying from job pod '${state.jobPod}' ${containerTemp} to ${runnerTemp}` `Copying from job pod '${state.jobPod}' ${containerTemp} to ${runnerTemp}`
) )
await execCpFromPod( await execCpFromPod(state.jobPod, containerTemp, `${workdir}`)
state.jobPod,
`${containerTemp}/_runner_file_commands`,
`${runnerTemp}`
)
} catch (error) { } catch (error) {
core.warning('Failed to copy _temp from pod') core.warning('Failed to copy _temp from pod')
} }

2
packages/k8s/src/k8s/index.ts
View File

@@ -342,6 +342,7 @@ export async function execCalculateOutputHashSorted(
const hash = createHash('sha256') const hash = createHash('sha256')
hash.update(sortedOutput) hash.update(sortedOutput)
console.log(`sortedOutput: ${sortedOutput}`)
return hash.digest('hex') return hash.digest('hex')
} }
@@ -370,6 +371,7 @@ export async function localCalculateOutputHashSorted(
const hash = createHash('sha256') const hash = createHash('sha256')
hash.update(sortedOutput) hash.update(sortedOutput)
console.log(`sortedOutput: ${sortedOutput}`)
resolve(hash.digest('hex')) resolve(hash.digest('hex'))
} else { } else {
reject(new Error(`child process exited with code ${code}`)) reject(new Error(`child process exited with code ${code}`))