Skip to content

Commit 9935084

Browse files
authored
Merge pull request #308 from aminya/artifacts [skip ci]
2 parents 9560b8d + 2a67ff9 commit 9935084

File tree

6 files changed

+6
-7
lines changed

6 files changed

+6
-7
lines changed

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/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
Large diffs are not rendered by default.

src/utils/env/arch.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export const x86_64 = ["x64", "amd64", "x86_64", "win64", "64"]
1+
export const x86_64 = ["x64", "amd64", "x86_64", "win64", "64", "amd64_x86"]
22
export const x86 = ["x86", "i386", "ia32", "win32", "32", "x32"]
33
export const arm64 = ["aarch64", "arm64", "woa64", "arm"]
44
export const armv7 = ["armv7", "armv7a"]

src/versions/default_versions.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ export const DefaultVersions: Record<string, string | undefined> = {
1818
"clang-format": defaultLLVM,
1919
clangformat: defaultLLVM,
2020
ninja: "1.12.1", // https://github.com/ninja-build/ninja/releases
21-
cmake: "3.30.3", // https://github.com/Kitware/CMake/releases
22-
conan: "1.65.0", // 2.7.1 // https://github.com/conan-io/conan/releases
21+
cmake: "3.30.4", // https://github.com/Kitware/CMake/releases
2322
meson: "1.5.2", // https://github.com/mesonbuild/meson/releases
2423
kcov: "42", // https://github.com/SimonKagstrom/kcov/releases
2524
task: "3.39.2", // https://github.com/go-task/task/releases

0 commit comments

Comments
 (0)