Skip to content

Commit 3a19939

Browse files
committed
fix: handle no version for cmake
1 parent 3b773c4 commit 3a19939

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

dist/legacy/assets/actions_python-CuNJhsEe.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/legacy/setup-cpp.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/legacy/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/modern/assets/actions_python-4hsZpmjR.mjs.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/modern/setup-cpp.mjs

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

dist/modern/setup-cpp.mjs.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/cmake/cmake.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import { info } from "ci-log"
22
import { addExeExt } from "patha"
3-
import semverCoerce from "semver/functions/coerce"
43
import semverLte from "semver/functions/lte"
54
import { hasApk, installApkPack } from "setup-alpine"
65
import { arm64, x86, x86_64 } from "../utils/env/arch.js"
76
import { type InstallationInfo, type PackageInfo, setupBin } from "../utils/setup/setupBin.js"
7+
import { semverCoerceIfInvalid } from "../utils/setup/version.js"
88

99
/** Get the platform data for cmake */
1010
function getCmakePackageInfo(version: string, platform: NodeJS.Platform, arch: string): PackageInfo {
11-
const semVersion = semverCoerce(version) ?? version
11+
const semVersion = version === "" ? "" : semverCoerceIfInvalid(version)
1212
switch (platform) {
1313
case "win32": {
14-
const isOld = semverLte(semVersion, "v3.19.6")
14+
const isOld = semVersion === "" ? false : semverLte(semVersion, "v3.19.6")
1515
let osArchStr: string
1616
if (x86_64.includes(arch)) {
1717
osArchStr = isOld ? "win64-x64" : "windows-x86_64"
@@ -32,7 +32,7 @@ function getCmakePackageInfo(version: string, platform: NodeJS.Platform, arch: s
3232
}
3333
}
3434
case "darwin": {
35-
const isOld = semverLte(semVersion, "v3.19.1")
35+
const isOld = semVersion === "" ? false : semverLte(semVersion, "v3.19.1")
3636
const osArchStr = isOld ? "Darwin-x86_64" : "macos-universal"
3737
const folderName = `cmake-${version}-${osArchStr}`
3838
return {
@@ -43,7 +43,7 @@ function getCmakePackageInfo(version: string, platform: NodeJS.Platform, arch: s
4343
}
4444
}
4545
case "linux": {
46-
const isOld = semverLte(semVersion, "v3.19.8")
46+
const isOld = semVersion === "" ? false : semverLte(semVersion, "v3.19.8")
4747
let osArchStr: string
4848
if (arm64.includes(arch)) {
4949
osArchStr = isOld ? "Linux-aarch64" : "linux-aarch64"

0 commit comments

Comments
 (0)