chore(build): update dist

.github/workflows/CI.yml

@@ -20,11 +20,16 @@ jobs:
   Build:
     runs-on: ${{ matrix.os }}
     name: Build
+    if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
     strategy:
       fail-fast: false
       matrix:
         os:
           - ubuntu-22.04
+        node:
+          - 22.6.0
+        pnpm:
+          - 9.11.0
     steps:
       - uses: actions/checkout@v4
         with:
@@ -33,10 +38,12 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version-file: "./.nvmrc"
+          node-version: ${{ matrix.node }}
 
       - name: Setup Pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v2
+        with:
+          version: ${{ matrix.pnpm }}
 
       - name: Install
         run: |
@@ -77,6 +84,7 @@ jobs:
   BuildExecutable:
     name: Build-Executable-${{ matrix.os }}
     needs: [Build]
+    if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -86,6 +94,10 @@ jobs:
           - ubuntu-24.04
           - macos-13
           - macos-14 # arm64
+        node:
+          - 22
+        pnpm:
+          - 9.11.0
     steps:
       - uses: actions/checkout@v4
 
@@ -97,10 +109,12 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version-file: "./.nvmrc"
+          node-version: ${{ matrix.node }}
 
       - name: Setup Pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v2
+        with:
+          version: ${{ matrix.pnpm }}
 
       - name: Cache node_modules
         uses: actions/cache@v4
@@ -109,7 +123,7 @@ jobs:
             ~/.pnpm-store
             D:\.pnpm-store
             ./node_modules
-          key: "setupcpp-node_modules-cache-OS:${{ matrix.os }}-${{ hashFiles('./.npmrc', './package.json', '.nvmrc', './packages/*/package.json') }}"
+          key: "setupcpp-node_modules-cache-OS:${{ matrix.os }}-node:${{ matrix.node }}-pnpm:${{ matrix.pnpm }}-${{ hashFiles('./.npmrc') }}-deps:${{ hashFiles('./package.json') }}"
           restore-keys: |
             "setupcpp-node_modules-cache-OS:${{ matrix.os }}-"
 
@@ -132,6 +146,7 @@ jobs:
 
   Test:
     name: Test-${{ matrix.os }}
+    if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
     needs: [Build]
     runs-on: ${{ matrix.os }}
     strategy:
@@ -146,6 +161,10 @@ jobs:
           - macos-14
           - macos-13
           - macos-12
+        node:
+          - 22
+        pnpm:
+          - 9.11.0
     steps:
       - uses: actions/checkout@v4
         with:
@@ -159,10 +178,12 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version-file: "./.nvmrc"
+          node-version: ${{ matrix.node }}
 
       - name: Setup Pnpm
-        uses: pnpm/action-setup@v4
+        uses: pnpm/action-setup@v2
+        with:
+          version: ${{ matrix.pnpm }}
 
       - name: Cache node_modules
         uses: actions/cache@v4
@@ -171,7 +192,7 @@ jobs:
             ~/.pnpm-store
             D:\.pnpm-store
             ./node_modules
-          key: "setupcpp-node_modules-cache-OS:${{ matrix.os }}-${{ hashFiles('./.npmrc', './package.json', '.nvmrc', './packages/*/package.json') }}"
+          key: "setupcpp-node_modules-cache-OS:${{ matrix.os }}-node:${{ matrix.node }}-pnpm:${{ matrix.pnpm }}-${{ hashFiles('./.npmrc') }}-deps:${{ hashFiles('./package.json') }}"
           restore-keys: |
             "setupcpp-node_modules-cache-OS:${{ matrix.os }}-"
 
@@ -213,6 +234,7 @@ jobs:
 
   Docker:
     name: Docker-${{ matrix.container.image }}
+    if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
     needs: [Build]
     runs-on: ${{ matrix.os }}
     strategy:
@@ -220,13 +242,17 @@ jobs:
       matrix:
         os:
           - ubuntu-24.04
+        node:
+          - 22
+        pnpm:
+          - 9.11.0
         container:
-          - { file: "ubuntu-llvm.dockerfile", image: "setup-cpp-ubuntu-llvm", tag: "22.04-0.44.0" }
+          - { file: "ubuntu-llvm.dockerfile", image: "setup-cpp-ubuntu-llvm", tag: "22.04-0.43.0" }
-          - { file: "fedora-llvm.dockerfile", image: "setup-cpp-fedora-llvm", tag: "40-0.44.0" }
+          - { file: "fedora-llvm.dockerfile", image: "setup-cpp-fedora-llvm", tag: "40-0.43.0" }
-          - { file: "arch-llvm.dockerfile", image: "setup-cpp-arch-llvm", tag: "base-0.44.0" }
+          - { file: "arch-llvm.dockerfile", image: "setup-cpp-arch-llvm", tag: "base-0.43.0" }
-          - { file: "ubuntu-mingw.dockerfile", image: "setup-cpp-ubuntu-mingw", tag: "22.04-0.44.0" }
+          - { file: "ubuntu-mingw.dockerfile", image: "setup-cpp-ubuntu-mingw", tag: "22.04-0.43.0" }
-          # - { file: "fedora-mingw.dockerfile", image: "setup-cpp-fedora-mingw", tag: "40-0.44.0" }
+          # - { file: "fedora-mingw.dockerfile", image: "setup-cpp-fedora-mingw", tag: "40-0.43.0" }
-          # - { file: "arch-mingw.dockerfile", image: "setup-cpp-arch-mingw", tag: "base-0.44.0" }
+          # - { file: "arch-mingw.dockerfile", image: "setup-cpp-arch-mingw", tag: "base-0.43.0" }
     steps:
       - uses: actions/checkout@v4
         with:

.nvmrc

@@ -1 +1 @@
-22.10.0
+v22.6.0

.vscode/settings.json

@@ -26,9 +26,6 @@
   "[yaml]": {
     "editor.defaultFormatter": "dprint.dprint"
   },
-  "[github-actions-workflow]": {
-    "editor.defaultFormatter": "dprint.dprint"
-  },
   "cSpell.advanced.feature.useReferenceProviderWithRename": true,
   "cSpell.checkOnlyEnabledFileTypes": false,
   "cSpell.numSuggestions": 3,

README.md

@@ -57,22 +57,22 @@ NOTE: setup-cpp requires Nodejs 12 or higher. If Nodejs shipped with your distri
 
 #### With executable
 
-Download the executable for your platform from [here](https://github.com/aminya/setup-cpp/releases/tag/v0.44.0), and run it with the available options. You can also automate downloading using `curl`, or other similar tools.
+Download the executable for your platform from [here](https://github.com/aminya/setup-cpp/releases/tag/v0.43.0), and run it with the available options. You can also automate downloading using `curl`, or other similar tools.
 
 ```shell
 # windows x64
-curl -o ./setup-cpp.exe -LJ "https://github.com/aminya/setup-cpp/releases/download/v0.44.0/setup-cpp-x64-windows.exe"
+curl -o ./setup-cpp.exe -LJ "https://github.com/aminya/setup-cpp/releases/download/v0.43.0/setup-cpp-x64-windows.exe"
 
 # linux x64
-curl -o ./setup-cpp -LJ "https://github.com/aminya/setup-cpp/releases/download/v0.44.0/setup-cpp-x64-linux"
+curl -o ./setup-cpp -LJ "https://github.com/aminya/setup-cpp/releases/download/v0.43.0/setup-cpp-x64-linux"
 chmod +x ./setup-cpp
 
 # macos arm64
-curl -o ./setup-cpp -LJ "https://github.com/aminya/setup-cpp/releases/download/v0.44.0/setup-cpp-arm64-macos"
+curl -o ./setup-cpp -LJ "https://github.com/aminya/setup-cpp/releases/download/v0.43.0/setup-cpp-arm64-macos"
 chmod +x ./setup-cpp
 
 # macos x64
-curl -o ./setup-cpp -LJ "https://github.com/aminya/setup-cpp/releases/download/v0.44.0/setup-cpp-x64-macos"
+curl -o ./setup-cpp -LJ "https://github.com/aminya/setup-cpp/releases/download/v0.43.0/setup-cpp-x64-macos"
 chmod +x ./setup-cpp
 ```
 
@@ -131,19 +131,13 @@ jobs:
         uses: actions/cache@v3
         with:
           path: |
-            ./build/
             ~/vcpkg
-            ~/.cache/vcpkg/archives
+            ./build/vcpkg_installed
-            ${{ env.LOCALAPPDATA }}/vcpkg/archives
+            ${{ env.HOME }}/.cache/vcpkg/archives
-            ${{ env.APPDATA }}/vcpkg/archives
             ${{ env.XDG_CACHE_HOME }}/vcpkg/archives
-            ~/.cache/ccache
+            ${{ env.LOCALAPPDATA }}\vcpkg\archives
-            ~/.ccache
+            ${{ env.APPDATA }}\vcpkg\archives
-            ~/.config/ccache
+          key: ${{ runner.os }}-${{ matrix.compiler }}-${{ env.BUILD_TYPE }}-${{ hashFiles('**/CMakeLists.txt') }}-${{ hashFiles('./vcpkg.json')}}
-            ~/Library/Caches/ccache
-            ${{ env.LOCALAPPDATA }}/ccache
-            ${{ env.XDG_CACHE_HOME }}/ccache
-          key: ${{ runner.os }}-${{ matrix.compiler }}-${{ env.BUILD_TYPE }}-${{ hashFiles('**/CMakeLists.txt', './vcpkg.json') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.BUILD_TYPE }}-
 
@@ -167,19 +161,19 @@ To provide fast development environments, `setup-cpp` provides several prebuilt
 You can use these images as a base image for your project.
 
 ```dockerfile
-FROM aminya/setup-cpp-ubuntu-llvm:22.04-0.44.0 AS builder
+FROM aminya/setup-cpp-ubuntu-llvm:22.04-0.43.0 AS builder
 ```
 
 ```dockerfile
-FROM aminya/setup-cpp-ubuntu-mingw:22.04-0.44.0 AS builder
+FROM aminya/setup-cpp-ubuntu-mingw:22.04-0.43.0 AS builder
 ```
 
 ```dockerfile
-FROM aminya/setup-cpp-fedora-llvm:40-0.44.0 AS builder
+FROM aminya/setup-cpp-fedora-llvm:40-0.43.0 AS builder
 ```
 
 ```dockerfile
-FROM aminya/setup-cpp-arch-llvm:base-0.44.0 AS builder
+FROM aminya/setup-cpp-arch-llvm:base-0.43.0 AS builder
 ```
 
 The names are in the format `aminya/setup-cpp-<platform>-<compiler>:<platform_version>-<setup_cpp_version>`.
@@ -198,7 +192,7 @@ RUN apt-get update -qq && \
     # install nodejs
     apt-get install -y --no-install-recommends nodejs npm && \
     # install setup-cpp
-    npm install -g setup-cpp@v0.44.0 && \
+    npm install -g setup-cpp@v0.43.0 && \
     # install the compiler and tools
     setup-cpp \
         --nala true \
@@ -307,7 +301,7 @@ stages:
   apt-get install -y --no-install-recommends nodejs npm
 
   # install setup-cpp
-  npm install -g setup-cpp@v0.44.0
+  npm install -g setup-cpp@v0.43.0
 
   # install the compiler and tools
   ./setup-cpp-x64-linux --compiler $compiler --cmake true --ninja true --ccache true --vcpkg true

cspell.config.yaml

@@ -81,7 +81,6 @@ words:
   - noreply
   - nothrow
   - npmrc
-  - nvmrc
   - Opencppcoverage
   - OSSDK
   - papm

dev/docker/setup-cpp/setup-cpp-arch-llvm.dockerfile

@@ -6,7 +6,7 @@ RUN pacman -Syuu --noconfirm && \
 # install nodejs
     pacman -S --noconfirm --needed nodejs npm && \
 # install setup-cpp
-    npm install -g setup-cpp@v0.44.0 && \
+    npm install -g setup-cpp@v0.43.0 && \
 # install the compiler and tools
     setup-cpp \
         --compiler llvm \

dev/docker/setup-cpp/setup-cpp-arch-mingw.dockerfile

@@ -6,7 +6,7 @@ RUN pacman -Syuu --noconfirm && \
 # install nodejs
     pacman -S --noconfirm --needed nodejs npm && \
 # install setup-cpp
-    npm install -g setup-cpp@v0.44.0 && \
+    npm install -g setup-cpp@v0.43.0 && \
 # install the compiler and tools
     setup-cpp \
         --compiler mingw \

dev/docker/setup-cpp/setup-cpp-fedora-llvm.dockerfile

@@ -4,7 +4,7 @@ FROM fedora:40 AS setup-cpp-fedora
 # install nodejs
 RUN dnf -y install nodejs npm && \
 # install setup-cpp
-    npm install -g setup-cpp@v0.44.0 && \
+    npm install -g setup-cpp@v0.43.0 && \
 # install the compiler and tools
     setup-cpp \
         --compiler llvm \

dev/docker/setup-cpp/setup-cpp-fedora-mingw.dockerfile

@@ -4,7 +4,7 @@ FROM fedora:40 AS setup-cpp-fedora-mingw
 # install nodejs
 RUN dnf -y install nodejs npm && \
 # install setup-cpp
-    npm install -g setup-cpp@v0.44.0 && \
+    npm install -g setup-cpp@v0.43.0 && \
 # install the compiler and tools
     setup-cpp \
         --compiler mingw \

dev/docker/setup-cpp/setup-cpp-ubuntu-20.0.4-llvm.dockerfile

@@ -11,7 +11,7 @@ RUN apt-get update -qq && \
     apt-get update -qq && \
     apt-get install -y --no-install-recommends nodejs && \
 # install setup-cpp
-    npm install -g setup-cpp@v0.44.0 && \
+    npm install -g setup-cpp@v0.43.0 && \
 # install the compiler and tools
     setup-cpp \
         --nala true \

dev/docker/setup-cpp/setup-cpp-ubuntu-llvm.dockerfile

@@ -5,7 +5,7 @@ RUN apt-get update -qq && \
 # install nodejs
     apt-get install -y --no-install-recommends nodejs npm && \
 # install setup-cpp
-    npm install -g setup-cpp@v0.44.0 && \
+    npm install -g setup-cpp@v0.43.0 && \
 # install the compiler and tools
     setup-cpp \
         --nala true \

dev/docker/setup-cpp/setup-cpp-ubuntu-mingw.dockerfile

@@ -5,7 +5,7 @@ RUN apt-get update -qq && \
 # install nodejs
     apt-get install -y --no-install-recommends nodejs npm && \
 # install setup-cpp
-    npm install -g setup-cpp@v0.44.0 && \
+    npm install -g setup-cpp@v0.43.0 && \
 # install the compiler and tools
     setup-cpp \
         --nala true \

package-version.json

@@ -1,4 +1,4 @@
 {
   "name": "setup-cpp",
-  "version": "0.44.0"
+  "version": "0.43.0"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-cpp",
-  "version": "0.44.0",
+  "version": "0.43.0",
   "description": "Install all the tools required for building and testing C++/C projects.",
   "repository": "https://github.com/aminya/setup-cpp",
   "license": "Apache-2.0",
@@ -112,7 +112,7 @@
     "msvc-dev-cmd": "github:aminya/msvc-dev-cmd#c01f519bd995460228ed3dec4df51df92dc290fd",
     "node-downloader-helper": "2.1.9",
     "npm-check-updates": "^17.1.2",
-    "npm-run-all2": "^7.0.0",
+    "npm-run-all2": "^6.2.3",
     "numerous": "2.0.0",
     "p-timeout": "^6.1.2",
     "path-exists": "^5.0.0",
@@ -135,7 +135,7 @@
     "timers-browserify": "^2.0.12",
     "ts-node": "^10.9.2",
     "ts-readme": "^1.1.3",
-    "turbo": "2.2.3",
+    "turbo": "2.1.2",
     "typescript": "^5.6.2",
     "ubuntu-version": "^2.0.0",
     "untildify-user": "workspace:*",
@@ -143,7 +143,7 @@
     "vite": "^5.4.6",
     "vite-plugin-babel": "^1.2.0",
     "web-streams-polyfill": "^4.0.0",
-    "which": "^5.0.0"
+    "which": "^4.0.0"
   },
   "productionDependencies": [
     "@actions/core",
@@ -187,7 +187,7 @@
     "node": ">=12.x",
     "pnpm": "^9"
   },
-  "packageManager": "pnpm@9.12.2",
+  "packageManager": "pnpm@9.11.0",
   "workspaces": [
     "packages/*"
   ],

packages/ci-log/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ci-log",
-  "version": "1.0.2",
+  "version": "1.0.1",
   "description": "Colorful logging and print for any environment including GitHub Actions",
   "repository": "https://github.com/aminya/setup-cpp",
   "homepage": "https://github.com/aminya/setup-cpp/tree/master/packages/ci-log",

packages/ci-log/src/index.ts

@@ -1,6 +1,5 @@
 import * as core from "@actions/core"
-import ciInfo from "ci-info"
+import { GITHUB_ACTIONS } from "ci-info"
-const { GITHUB_ACTIONS } = ciInfo
 
 export function error(err: string | Error) {
   return GITHUB_ACTIONS ? core.error(err) : console.log(`\x1b[31m${err}\x1b[0m`)

packages/envosman/package.json

@@ -1,6 +1,6 @@
 {
   "name": "envosman",
-  "version": "1.0.3",
+  "version": "1.0.2",
   "description": "Manage environment variables, PATH, and rc files",
   "repository": "https://github.com/aminya/setup-cpp",
   "homepage": "https://github.com/aminya/setup-cpp/tree/master/packages/envosman",

packages/envosman/src/add-env.ts

@@ -1,7 +1,6 @@
 import { promises } from "fs"
 import { exportVariable as ghExportVariable } from "@actions/core"
-import ciInfo from "ci-info"
+import { GITHUB_ACTIONS } from "ci-info"
-const { GITHUB_ACTIONS } = ciInfo
 import { error, info } from "ci-log"
 import { execPowershell } from "exec-powershell"
 import { defaultRcPath, sourceRCInRc } from "./rc-file.js"

packages/envosman/src/add-path.ts

@@ -1,8 +1,7 @@
 import { promises } from "fs"
 import { delimiter } from "path"
 import { addPath as ghAddPath } from "@actions/core"
-import ciInfo from "ci-info"
+import { GITHUB_ACTIONS } from "ci-info"
-const { GITHUB_ACTIONS } = ciInfo
 import { error, info } from "ci-log"
 import { execPowershell } from "exec-powershell"
 import { defaultRcPath, sourceRCInRc } from "./rc-file.js"

packages/setup-apt/package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-apt",
-  "version": "2.0.2",
+  "version": "2.0.0",
   "description": "Setup apt packages and repositories in Debian/Ubuntu-based distributions",
   "repository": "https://github.com/aminya/setup-cpp",
   "homepage": "https://github.com/aminya/setup-cpp/tree/master/packages/setup-apt",
@@ -9,11 +9,6 @@
   "main": "./dist/index.js",
   "source": "./src/index.ts",
   "type": "module",
-  "files": [
-    "dist",
-    "src",
-    "tsconfig.json"
-  ],
   "scripts": {
     "build": "tsc --pretty",
     "dev": "tsc --watch --pretty",

packages/setup-apt/src/alternatives.ts

@@ -1,7 +1,6 @@
 import { promises } from "fs"
 import { execRoot } from "admina"
-import ciInfo from "ci-info"
+import { GITHUB_ACTIONS } from "ci-info"
-const { GITHUB_ACTIONS } = ciInfo
 import { sourceRC } from "envosman"
 import type { RcOptions } from "envosman/dist/rc-file.js"
 const { appendFile } = promises

packages/setup-brew/package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-brew",
-  "version": "1.0.2",
+  "version": "1.0.1",
   "description": "Setup brew and brew packages",
   "repository": "https://github.com/aminya/setup-cpp",
   "homepage": "https://github.com/aminya/setup-cpp/tree/master/packages/setup-brew",
@@ -9,11 +9,6 @@
   "main": "./dist/index.js",
   "source": "./src/index.ts",
   "type": "module",
-  "files": [
-    "dist",
-    "src",
-    "tsconfig.json"
-  ],
   "scripts": {
     "build": "tsc --pretty",
     "dev": "tsc --watch --pretty",

src/cmake/__tests__/cmake.test.ts

@@ -1,5 +1,4 @@
-import ciInfo from "ci-info"
+import { GITHUB_ACTIONS } from "ci-info"
-const { GITHUB_ACTIONS } = ciInfo
 import { cleanupTmpDir, setupTmpDir, testBin } from "../../utils/tests/test-helpers.js"
 import { getVersion } from "../../versions/versions.js"
 import { setupCmake } from "../cmake.js"

src/gcc/gcc.ts

@@ -1,7 +1,6 @@
 import path from "path"
 import { fileURLToPath } from "url"
-import ciInfo from "ci-info"
+import { GITHUB_ACTIONS } from "ci-info"
-const { GITHUB_ACTIONS } = ciInfo
 import { error, info, warning } from "ci-log"
 import { addEnv } from "envosman"
 import { execa } from "execa"

src/gcc/mingw.ts

@@ -1,7 +1,6 @@
 import path, { join } from "path"
 import { fileURLToPath } from "url"
-import ciInfo from "ci-info"
+import { GITHUB_ACTIONS } from "ci-info"
-const { GITHUB_ACTIONS } = ciInfo
 import { info } from "ci-log"
 import { addEnv, addPath } from "envosman"
 import { pathExists } from "path-exists"

src/llvm/llvm.ts

@@ -2,8 +2,7 @@ import { tmpdir } from "os"
 import path, { delimiter, join } from "path"
 import { fileURLToPath } from "url"
 import { execRootSync } from "admina"
-import ciInfo from "ci-info"
+import { GITHUB_ACTIONS } from "ci-info"
-const { GITHUB_ACTIONS } = ciInfo
 import { info, warning } from "ci-log"
 import { addEnv } from "envosman"
 import memoize from "memoizee"

src/msvc/msvc.ts

@@ -2,8 +2,7 @@ import path, { join } from "path"
 import { fileURLToPath } from "url"
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-import ciInfo from "ci-info"
+import { GITHUB_ACTIONS } from "ci-info"
-const { GITHUB_ACTIONS } = ciInfo
 import { error, info, warning } from "ci-log"
 import { findVcvarsall, vsversion_to_versionnumber } from "msvc-dev-cmd/lib.js"
 import { pathExists } from "path-exists"

src/ninja/__tests__/ninja.test.ts

@@ -1,5 +1,4 @@
-import ciInfo from "ci-info"
+import { GITHUB_ACTIONS } from "ci-info"
-const { GITHUB_ACTIONS } = ciInfo
 import { cleanupTmpDir, setupTmpDir, testBin } from "../../utils/tests/test-helpers.js"
 import { getVersion } from "../../versions/versions.js"
 import { setupNinja } from "../ninja.js"

src/powershell/__tests__/powershell.test.ts

@@ -1,5 +1,4 @@
-import ciInfo from "ci-info"
+import { GITHUB_ACTIONS } from "ci-info"
-const { GITHUB_ACTIONS } = ciInfo
 import { cleanupTmpDir, setupTmpDir, testBin } from "../../utils/tests/test-helpers.js"
 import { getVersion } from "../../versions/versions.js"
 import { setupPowershell } from "../powershell.js"

src/python/__tests__/python.test.ts

@@ -1,5 +1,4 @@
-import ciInfo from "ci-info"
+import { GITHUB_ACTIONS } from "ci-info"
-const { GITHUB_ACTIONS } = ciInfo
 import { info } from "ci-log"
 import { ubuntuVersion } from "../../utils/env/ubuntu_version.js"
 import { cleanupTmpDir, setupTmpDir, testBin } from "../../utils/tests/test-helpers.js"

src/python/actions_python.ts

@@ -1,8 +1,7 @@
 import path, { join } from "path"
 import { fileURLToPath } from "url"
 import { debug } from "@actions/core"
-import ciInfo from "ci-info"
+import { GITHUB_ACTIONS } from "ci-info"
-const { GITHUB_ACTIONS } = ciInfo
 import { info, warning } from "ci-log"
 import { pathExists } from "path-exists"
 import { findPyPyVersion } from "setup-python/src/find-pypy.js"

src/python/python.ts

@@ -2,8 +2,7 @@ import assert from "assert"
 import { homedir } from "os"
 import { dirname, join, parse as pathParse } from "path"
 import { getExecOutput } from "@actions/exec"
-import ciInfo from "ci-info"
+import { GITHUB_ACTIONS } from "ci-info"
-const { GITHUB_ACTIONS } = ciInfo
 import { info, warning } from "ci-log"
 import { addPath } from "envosman"
 import { execa } from "execa"

src/task/__tests__/task.test.ts

@@ -1,5 +1,4 @@
-import ciInfo from "ci-info"
+import { GITHUB_ACTIONS } from "ci-info"
-const { GITHUB_ACTIONS } = ciInfo
 import { cleanupTmpDir, setupTmpDir, testBin } from "../../utils/tests/test-helpers.js"
 import { getVersion } from "../../versions/versions.js"
 import { setupTask } from "../task.js"

src/utils/env/arch.ts

@@ -1,4 +1,4 @@
-export const x86_64 = ["x64", "amd64", "x86_64", "win64", "64", "amd64_x86"]
+export const x86_64 = ["x64", "amd64", "x86_64", "win64", "64"]
 export const x86 = ["x86", "i386", "ia32", "win32", "32", "x32"]
 export const arm64 = ["aarch64", "arm64", "woa64", "arm"]
 export const armv7 = ["armv7", "armv7a"]

src/utils/setup/setupBin.ts

@@ -1,8 +1,7 @@
 import { tmpdir } from "os"
 import { basename, join } from "path"
 import { cacheDir, downloadTool, find } from "@actions/tool-cache"
-import ciInfo from "ci-info"
+import { GITHUB_ACTIONS } from "ci-info"
-const { GITHUB_ACTIONS } = ciInfo
 import { info, warning } from "ci-log"
 import { addPath } from "envosman"
 import { chmod } from "fs/promises"

src/versions/default_versions.ts

@@ -18,7 +18,8 @@ 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.4", // https://github.com/Kitware/CMake/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
   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