actions
/
setup-cpp
Template
mirror of https://github.com/aminya/setup-cpp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: trim sdkroot output

This commit is contained in:
Amin Yahyaabadi 2021-12-11 17:21:44 -06:00
parent ab471df24f
commit 3b3e893ce4
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/setup_cpp.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/setup_cpp.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
src/macos-sdk/macos-sdk.ts
View File

@ -7,7 +7,7 @@ export async function setupMacOSSDK() {
const xcrun = await getExecOutput("xcrun --sdk macosx --show-sdk-path") const xcrun = await getExecOutput("xcrun --sdk macosx --show-sdk-path")
const sdkroot = xcrun.stdout || xcrun.stderr const sdkroot = xcrun.stdout || xcrun.stderr
if (sdkroot) { if (sdkroot) {
core.exportVariable("SDKROOT", sdkroot) core.exportVariable("SDKROOT", sdkroot.trim())
} else { } else {
core.error(`SDKROOT not set`) core.error(`SDKROOT not set`)
} }

5
src/utils/setup/version.ts
View File

@ -58,8 +58,9 @@ export const defaultVersionRegex = /v?(\d\S*)/
/** Get the version of a binary */ /** Get the version of a binary */
export async function getBinVersion(file: string, versionRegex: RegExp = defaultVersionRegex) { export async function getBinVersion(file: string, versionRegex: RegExp = defaultVersionRegex) {
try { try {
const { stderr, stdout } = await getExecOutput(file, ["--version"]) const execout = await getExecOutput(file, ["--version"])
const version = stdout.match(versionRegex)?.[1] ?? stderr.match(versionRegex)?.[1] const version_output = execout.stdout || execout.stderr || ""
const version = version_output.trim().match(versionRegex)?.[1]
return version return version
} catch (e) { } catch (e) {
console.error(e) console.error(e)