Merge pull request #308 from aminya/artifacts [skip ci]

aminya · Oct 2, 2024 · 9935084 · 9935084
2 parents 9560b8d + 2a67ff9
commit 9935084
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/dist/legacy/setup-cpp.js b/dist/legacy/setup-cpp.js
diff --git a/dist/legacy/setup-cpp.js.map b/dist/legacy/setup-cpp.js.map
diff --git a/dist/modern/setup-cpp.mjs b/dist/modern/setup-cpp.mjs
diff --git a/dist/modern/setup-cpp.mjs.map b/dist/modern/setup-cpp.mjs.map
diff --git a/src/utils/env/arch.ts b/src/utils/env/arch.ts
@@ -1,4 +1,4 @@
-export const x86_64 = ["x64", "amd64", "x86_64", "win64", "64"]
+export const x86_64 = ["x64", "amd64", "x86_64", "win64", "64", "amd64_x86"]
 export const x86 = ["x86", "i386", "ia32", "win32", "32", "x32"]
 export const arm64 = ["aarch64", "arm64", "woa64", "arm"]
 export const armv7 = ["armv7", "armv7a"]

diff --git a/src/versions/default_versions.ts b/src/versions/default_versions.ts
@@ -18,8 +18,7 @@ export const DefaultVersions: Record<string, string | undefined> = {
   "clang-format": defaultLLVM,
   clangformat: defaultLLVM,
   ninja: "1.12.1", // https://github.com/ninja-build/ninja/releases
-  cmake: "3.30.3", // https://github.com/Kitware/CMake/releases
-  conan: "1.65.0", // 2.7.1 // https://github.com/conan-io/conan/releases
+  cmake: "3.30.4", // https://github.com/Kitware/CMake/releases
   meson: "1.5.2", // https://github.com/mesonbuild/meson/releases
   kcov: "42", // https://github.com/SimonKagstrom/kcov/releases
   task: "3.39.2", // https://github.com/go-task/task/releases