starred/orca
1
0
Fork 0
mirror of https://github.com/stablyai/orca.git synced 2026-10-18 00:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

build(ssh): read numeric linker PE version

Browse Source 
Co-authored-by: Orca <help@stably.ai>
This commit is contained in:
Jinwoo-H
2026-07-14 17:58:42 -04:00
co-authored by Orca
parent 756165552d
commit 1b775e6afe
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/scripts/ssh-relay-runtime-toolchain.mjs
+6 -3
View File
@@ -188,6 +188,8 @@ export function sshRelayRuntimeStripVersionProbe(platform) {
}
export function sshRelayRuntimeWindowsFileVersionInvocation(path) {
const versionInfo =
"[System.Diagnostics.FileVersionInfo]::GetVersionInfo([Environment]::GetEnvironmentVariable('ORCA_SSH_RELAY_TOOL_PATH'))"
return {
command: 'pwsh.exe',
args: [
@@ -195,7 +197,8 @@ export function sshRelayRuntimeWindowsFileVersionInvocation(path) {
'-NoProfile',
'-NonInteractive',
'-Command',
"[System.Diagnostics.FileVersionInfo]::GetVersionInfo([Environment]::GetEnvironmentVariable('ORCA_SSH_RELAY_TOOL_PATH')).FileVersion"
// Why: hosted link.exe returns an empty FileVersion string; its numeric PE fields are stable.
`$versionInfo = ${versionInfo}; '{0}.{1}.{2}.{3}' -f $versionInfo.FileMajorPart, $versionInfo.FileMinorPart, $versionInfo.FileBuildPart, $versionInfo.FilePrivatePart`
],
options: { env: { ORCA_SSH_RELAY_TOOL_PATH: path } }
}
@@ -245,9 +248,9 @@ export async function collectSshRelayRuntimeToolchain(nodePath) {
linker: await executableRecord({
command: 'link.exe',
args: [],
// Why: hosted link.exe is pipe-silent; authenticated PE metadata gives its real version.
// Why: hosted link.exe is pipe-silent; authenticated numeric PE metadata gives its version.
windowsFileVersion: true,
versionPattern: /^\d+(?:\.\d+){2,3}(?:\s.*)?$/
versionPattern: /^(?!0\.0\.0\.0$)\d+(?:\.\d+){3}$/
}),
buildSystem: await executableRecord({
command: 'msbuild.exe',
config/scripts/ssh-relay-runtime-toolchain.test.mjs
+13 -4
View File
@@ -31,10 +31,19 @@ describe('SSH relay runtime build provenance', () => {
it('selects a bounded Windows linker file version', () => {
expect(
selectSshRelayRuntimeToolVersion(
{ stdout: '14.44.35228.0 built by release pipeline\r\n' },
/^\d+(?:\.\d+){2,3}(?:\s.*)?$/
{ stdout: '14.44.35228.0\r\n' },
/^(?!0\.0\.0\.0$)\d+(?:\.\d+){3}$/
)
).toBe('14.44.35228.0 built by release pipeline')
).toBe('14.44.35228.0')
})
it('rejects an absent Windows linker numeric file version', () => {
expect(() =>
selectSshRelayRuntimeToolVersion(
{ stdout: '0.0.0.0\r\n' },
/^(?!0\.0\.0\.0$)\d+(?:\.\d+){3}$/
)
).toThrow(/0\.0\.0\.0/)
})
it('passes the resolved linker path through a non-interpolated environment value', () => {
@@ -46,7 +55,7 @@ describe('SSH relay runtime build provenance', () => {
'-NoProfile',
'-NonInteractive',
'-Command',
"[System.Diagnostics.FileVersionInfo]::GetVersionInfo([Environment]::GetEnvironmentVariable('ORCA_SSH_RELAY_TOOL_PATH')).FileVersion"
"$versionInfo = [System.Diagnostics.FileVersionInfo]::GetVersionInfo([Environment]::GetEnvironmentVariable('ORCA_SSH_RELAY_TOOL_PATH')); '{0}.{1}.{2}.{3}' -f $versionInfo.FileMajorPart, $versionInfo.FileMinorPart, $versionInfo.FileBuildPart, $versionInfo.FilePrivatePart"
],
options: { env: { ORCA_SSH_RELAY_TOOL_PATH: path } }
})