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

fix: fix parsing of gcc version from the binary

This commit is contained in:
Amin Yahyaabadi 2025-02-27 12:28:36 -08:00
parent 4c635e726f
commit 8e83c0e114
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/legacy/setup-cpp.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/legacy/setup-cpp.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/modern/setup-cpp.mjs vendored
View File

File diff suppressed because one or more lines are too long

2
dist/modern/setup-cpp.mjs.map vendored
View File

File diff suppressed because one or more lines are too long

9
src/gcc/gcc.ts
View File

@ -222,7 +222,7 @@ async function findGccExe(variant: "gcc" | "g++", binDir: string, binVersion: st
binVersion === ""
|| file.includes(binVersion)
/* eslint-disable-next-line no-await-in-loop */
|| (await getGccCmdVersion(gccExe)) === binVersion
|| (await getGccCmdVersion(gccExe))?.includes(binVersion)
) {
return addExeExt(gccExe)
}
@ -241,13 +241,14 @@ async function getGccCmdVersion(gccExe: string) {
const { stdout: versionStdout } = await execa(gccExe, ["--version"], { stdio: "pipe" })
// gcc-11 (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0
// gcc-12 (Homebrew GCC 12.4.0) 12.4.0
// gcc (Ubuntu 13.1.0-8ubuntu1~22.04) 13.1.0
// gcc-14 (Homebrew GCC 14.2.0_1) 14.2.0
// g++-14 (Homebrew GCC 14.2.0_1) 14.2.0
const versionMatch = (versionStdout as string).match(/gcc.* \(.*\) ([\d.]+)/)
const versionMatch = versionStdout.match(/(gcc|g\+\+).* \(.*\) ([\d.]+)/)
if (versionMatch !== null) {
return versionMatch[1]
return versionMatch[2]
}
warning(`Failed to parse gcc version from: ${versionStdout}`)