Merge pull request #21 from aminya/make-task

Author: aminya

README.md

@@ -23,6 +23,8 @@ The package can be used locally or from CI services like GitHub Actions.
 - vcpkg
 - meson
 - conan
+- make
+- task
 - ccache
 - cppcheck
 - clangtidy

action.yml

@@ -30,6 +30,12 @@ inputs:
   conan:
     description: "The conan version to install."
     required: false
+  make:
+    description: "The make version to install."
+    required: false
+  task:
+    description: "The task version to install."
+    required: false
   vcpkg:
     description: "The vcpkg version to install."
     required: false

dist/setup_cpp.js

@@ -56,7 +56,7 @@ export function setupChocolatey(
   if (maybeChoco !== null) {
     binDir = dirname(maybeChoco)
   } else {
-    binDir = "C:/ProgramData/Chocolatey/bin/"
+    binDir = `${process.env.ChocolateyInstall ?? "C:/ProgramData/chocolatey"}/bin`
   }
 
   if (existsSync(binDir)) {

dist/setup_cpp.js.map

@@ -1,5 +1,6 @@
 import { setupCmake } from "../cmake"
 import { setupTmpDir, cleanupTmpDir, testBin } from "../../utils/tests/test-helpers"
+import { isGitHubCI } from "../../utils/env/isci"
 
 jest.setTimeout(300000)
 
@@ -10,14 +11,16 @@ describe("setup-cmake", () => {
   })
 
   it("should setup CMake", async () => {
-    const { binDir } = await setupCmake("3.20.2", directory, "")
+    const { binDir } = await setupCmake("3.20.2", directory, process.arch)
     await testBin("cmake", ["--version"], binDir)
   })
 
   it("should find CMake in the cache", async () => {
-    const { binDir } = await setupCmake("3.20.2", directory, "")
+    const { binDir } = await setupCmake("3.20.2", directory, process.arch)
     await testBin("cmake", ["--version"], binDir)
-    expect(binDir.includes("ToolCache")).toBeTruthy()
+    if (isGitHubCI()) {
+      expect(binDir).toMatch(process.env.RUNNER_TOOL_CACHE ?? "hostedtoolcache")
+    }
   })
 
   afterAll(async () => {

src/chocolatey/chocolatey.ts

@@ -1,16 +1,13 @@
 import { extractZip, extractTar } from "@actions/tool-cache"
-import { getInput } from "@actions/core"
 import semverLte from "semver/functions/lte"
 import semverCoerce from "semver/functions/coerce"
 import { setupBin, PackageInfo, InstallationInfo } from "../utils/setup/setupBin"
 import { addBinExtension } from "../utils/extension/extension"
 
 /** Get the platform data for cmake */
-function getCmakePackageInfo(version: string, platform?: NodeJS.Platform): PackageInfo {
+function getCmakePackageInfo(version: string, platform: NodeJS.Platform, arch: string): PackageInfo {
   const semVersion = semverCoerce(version) ?? version
-  const platformStr = platform ?? process.platform
-  const arch = getInput("architecture") || process.arch
-  switch (platformStr) {
+  switch (platform) {
     case "win32": {
       const isOld = semverLte(semVersion, "v3.19.6")
       let osArchStr: string
@@ -58,12 +55,11 @@ function getCmakePackageInfo(version: string, platform?: NodeJS.Platform): Packa
       }
     }
     default:
-      throw new Error(`Unsupported platform '${platformStr}'`)
+      throw new Error(`Unsupported platform '${platform}'`)
   }
 }
 
 /** Setup cmake */
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export function setupCmake(version: string, setupDir: string, _arch: string): Promise<InstallationInfo> {
-  return setupBin("cmake", version, getCmakePackageInfo, setupDir)
+export function setupCmake(version: string, setupDir: string, arch: string): Promise<InstallationInfo> {
+  return setupBin("cmake", version, getCmakePackageInfo, setupDir, arch)
 }

src/cmake/__tests__/cmake.test.ts

@@ -11,6 +11,7 @@ const DefaultVersions: Record<string, string> = {
   meson: "0.61.1",
   python: "3.8.10",
   kcov: "v39",
+  task: "3.10.0",
   gcc: process.platform === "win32" ? "11.2.0.07112021" : "11",
 }
 

src/cmake/cmake.ts

@@ -24,8 +24,8 @@ export async function setupGcc(version: string, _setupDir: string, arch: string)
       } else if (arch === "ia32" && existsSync("C:/tools/mingw32/bin")) {
         binDir = "C:/tools/mingw32/bin"
         addPath(binDir)
-      } else if (existsSync("C:/ProgramData/Chocolatey/bin/g++.exe")) {
-        binDir = "C:/ProgramData/Chocolatey/bin/"
+      } else if (existsSync(`${process.env.ChocolateyInstall ?? "C:/ProgramData/chocolatey"}/bin/g++.exe`)) {
+        binDir = `${process.env.ChocolateyInstall ?? "C:/ProgramData/chocolatey"}/bin`
       }
       break
     }

src/default_versions.ts

@@ -31,7 +31,7 @@ describe("setup-Kcov", () => {
   // it("should find Kcov in the cache", async () => {
   //   const directory = await setupTmpDir("kcov-v39")
   //   const binDir = await testKcov("v39", directory)
-  //   expect(binDir.includes("ToolCache")).toBeTruthy()
+  //   expect(binDir.includes("hostedtoolcache")).toBeTruthy()
   //   await cleanupTmpDir("kcov-v39")
   // })
 })