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 finding the latest gcc installed

This commit is contained in:
Amin Yahyaabadi 2025-02-27 12:49:58 -08:00
parent 8e83c0e114
commit 0fe9cd6e11
5 changed files with 7 additions and 7 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

6
src/gcc/gcc.ts
View File

@ -201,13 +201,13 @@ async function findGccExe(variant: "gcc" | "g++", binDir: string, binVersion: st
}
// try to find the gcc exe in the bin dir
const gccExeRegex = new RegExp(`^${escapeRegex(variant)}-?(.*)(\\.exe)?$`)
const gccExeRegex = new RegExp(`^${escapeRegex(variant)}-?([\d\.\-]*)(\\.exe)?$`)
const files = (await readdir(binDir))
.filter((file) => gccExeRegex.test(file))
.sort(
(exe1, exe2) => {
const version1 = exe1.match(gccExeRegex)?.[1] ?? ""
const version2 = exe2.match(gccExeRegex)?.[1] ?? ""
const version1 = exe1.match(gccExeRegex)![1] ?? ""
const version2 = exe2.match(gccExeRegex)![1] ?? ""
try {
return compareVersion(version1, version2)
} catch {