Merge pull request #147 from aminya/sccache [skip ci]

aminya · web-flow · commit 740f226722a8 · 2022-11-20T22:16:09.000-08:00
diff --git a/action.yml b/action.yml
@@ -51,6 +51,9 @@ inputs:
   ccache:
     description: "The ccache version to install."
     required: false
+  sccache:
+    description: "The sccache version to install."
+    required: false
   doxygen:
     description: "The doxygen version to install."
     required: false
diff --git a/cspell.config.yaml b/cspell.config.yaml
@@ -67,6 +67,7 @@ words:
   - pwsh
   - pygments
   - pypy
+  - Sccache
   - setupcpp
   - setx
   - Syuu
diff --git a/dist/node12/setup_cpp.js b/dist/node12/setup_cpp.js
diff --git a/dist/node12/setup_cpp.js.map b/dist/node12/setup_cpp.js.map
diff --git a/dist/node16/setup_cpp.js b/dist/node16/setup_cpp.js
diff --git a/dist/node16/setup_cpp.js.map b/dist/node16/setup_cpp.js.map
diff --git a/src/brew/__tests__/brew.test.ts b/src/brew/__tests__/brew.test.ts
@@ -7,7 +7,7 @@ describe("setup-brew", () => {
     if (process.platform !== "darwin") {
       return
     }
-    const installInfo = setupBrew("", "", process.arch)
+    const installInfo = await setupBrew("", "", process.arch)
     await testBin("brew", ["--version"], installInfo?.binDir)
   })
 })
diff --git a/src/brew/brew.ts b/src/brew/brew.ts
@@ -1,11 +1,16 @@
-import { execFileSync } from "child_process"
+import execa from "execa"
 import { dirname } from "patha"
 import which from "which"
+import { tmpdir } from "os"
+import path, { join } from "path"
+import { mkdirP } from "@actions/io"
+import { readFileSync } from "fs"
+import { addPath } from "../utils/env/addEnv"
 
 let binDir: string | undefined
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-export function setupBrew(_version: string, _setupDir: string, _arch: string) {
+export async function setupBrew(_version: string, _setupDir: string, _arch: string) {
   if (!["darwin", "linux"].includes(process.platform)) {
     return undefined
   }
@@ -20,10 +25,37 @@ export function setupBrew(_version: string, _setupDir: string, _arch: string) {
   }
 
   // brew is not thread-safe
-  execFileSync(`/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"`, {
+  const brewTempDirectory = path.join(tmpdir(), "setup_cpp", "brew")
+  await mkdirP(brewTempDirectory)
+
+  execa.sync("curl", ["-LJO", "https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh"], {
+    cwd: brewTempDirectory,
+  })
+  const installSh = join(brewTempDirectory, "install.sh")
+
+  if (process.platform === "linux") {
+    const installShContent = readFileSync(installSh, "utf-8")
+
+    installShContent.replace("#!/bin/bash", "")
+  }
+
+  execa.sync("/bin/bash", [installSh], {
     stdio: "inherit",
+    env: {
+      NONINTERACTIVE: "1",
+    },
   })
-  binDir = "/usr/local/bin/"
+
+  binDir = getBrewPath()
+  await addPath(binDir)
 
   return { binDir }
 }
+
+export function getBrewPath() {
+  if (process.platform === "linux") {
+    return "/home/linuxbrew/.linuxbrew/bin/"
+  } else {
+    return "/usr/local/bin/"
+  }
+}
diff --git a/src/doxygen/doxygen.ts b/src/doxygen/doxygen.ts
@@ -54,7 +54,7 @@ export async function setupDoxygen(version: string, setupDir: string, arch: stri
       return installationInfo
     }
     case "darwin": {
-      const installationInfo = setupBrewPack("doxygen", undefined)
+      const installationInfo = await setupBrewPack("doxygen", undefined)
       await setupGraphviz(getVersion("graphviz", undefined), "", arch)
       return installationInfo
     }
diff --git a/src/gcc/gcc.ts b/src/gcc/gcc.ts
@@ -83,7 +83,7 @@ export async function setupGcc(version: string, setupDir: string, arch: string)
       break
     }
     case "darwin": {
-      installationInfo = setupBrewPack("gcc", version)
+      installationInfo = await setupBrewPack("gcc", version)
       break
     }
     case "linux": {
diff --git a/src/main.ts b/src/main.ts
@@ -47,6 +47,7 @@ import { setupBazel } from "./bazel/bazel"
 import { setupPowershell } from "./powershell/powershell"
 import { isArch } from "./utils/env/isArch"
 import { setupPacmanPack } from "./utils/setup/setupPacmanPack"
+import { setupSccache } from "./sccache/sccache"
 
 /** The setup functions */
 const setups = {
@@ -66,6 +67,7 @@ const setups = {
   brew: setupBrew,
   powershell: setupPowershell,
   ccache: setupCcache,
+  sccache: setupSccache,
   doxygen: setupDoxygen,
   graphviz: setupGraphviz,
   cppcheck: setupCppcheck,
@@ -366,20 +368,21 @@ All the available tools:
 --make
 --task
 --ccache
+--sccache
 --cppcheck
 --clangformat
 --clangtidy
 --doxygen
 --gcovr
 --opencppcoverage
 --kcov
-
 --python
 --choco
 --brew
 --nala
 --sevenzip
 --graphviz
+--powershell
       `)
 }
 
diff --git a/src/make/make.ts b/src/make/make.ts
@@ -15,7 +15,7 @@ export async function setupMake(version: string, _setupDir: string, _arch: strin
       return setupChocoPack("make", version)
     }
     case "darwin": {
-      setupBrewPack("make", version)
+      await setupBrewPack("make", version)
       await addPath("/usr/local/opt/make/libexec/gnubin")
       return { binDir: "/usr/local/opt/make/libexec/gnubin" }
     }
diff --git a/src/sccache/__tests__/sccache.test.ts b/src/sccache/__tests__/sccache.test.ts
@@ -0,0 +1,12 @@
+import { setupSccache } from "../sccache"
+import { testBin } from "../../utils/tests/test-helpers"
+import { InstallationInfo } from "../../utils/setup/setupBin"
+
+jest.setTimeout(300000)
+describe("setup-sccache", () => {
+  it("should setup sccache", async () => {
+    const installInfo = await setupSccache("", "", process.arch)
+
+    await testBin("sccache", ["--version"], (installInfo as InstallationInfo | undefined)?.binDir)
+  })
+})
diff --git a/src/sccache/sccache.ts b/src/sccache/sccache.ts
@@ -0,0 +1,18 @@
+import { setupBrewPack } from "../utils/setup/setupBrewPack"
+import { setupChocoPack } from "../utils/setup/setupChocoPack"
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export function setupSccache(version: string, _setupDir: string, _arch: string) {
+  switch (process.platform) {
+    case "win32": {
+      return setupChocoPack("sccache", version)
+    }
+    case "linux":
+    case "darwin": {
+      return setupBrewPack("sccache", version)
+    }
+    default: {
+      throw new Error(`Unsupported platform`)
+    }
+  }
+}
diff --git a/src/utils/env/addEnv.ts b/src/utils/env/addEnv.ts
@@ -6,6 +6,7 @@ import { error, warning } from "ci-log"
 import { execPowershell } from "exec-powershell"
 import { delimiter } from "path"
 import escapeSpace from "escape-path-with-spaces"
+import { giveUserAccess } from "user-access"
 
 /**
  * Add an environment variable.
@@ -125,6 +126,10 @@ export function setupCppInProfile() {
   appendFileSync(cpprc_path, `\n${source_cpprc_str}\n`)
   info(`Added ${source_cpprc_str} to ${cpprc_path}`)
 
+  giveUserAccess(cpprc_path)
+
+  // source cpprc in bashrc/profile
+
   const source_cpprc_string = `\n# source .cpprc if SOURCE_CPPRC is not set to 0\nif [[ "$SOURCE_CPPRC" != 0 && -f "${cpprc_path}" ]]; then source "${cpprc_path}"; fi\n`
 
   try {
diff --git a/src/utils/setup/setupBrewPack.ts b/src/utils/setup/setupBrewPack.ts
@@ -1,25 +1,36 @@
 /* eslint-disable require-atomic-updates */
 import { info } from "@actions/core"
 import execa from "execa"
+import { join } from "patha"
 import which from "which"
-import { setupBrew } from "../../brew/brew"
+import { getBrewPath, setupBrew } from "../../brew/brew"
 import { InstallationInfo } from "./setupBin"
 
 let hasBrew = false
 
 /** A function that installs a package using brew */
-export function setupBrewPack(name: string, version?: string, extraArgs: string[] = []): InstallationInfo {
+export async function setupBrewPack(
+  name: string,
+  version?: string,
+  extraArgs: string[] = []
+): Promise<InstallationInfo> {
   info(`Installing ${name} ${version ?? ""} via brew`)
 
   if (!hasBrew || which.sync("brew", { nothrow: true }) === null) {
-    setupBrew("", "", process.arch)
+    await setupBrew("", "", process.arch)
     hasBrew = true
   }
 
+  const binDir = getBrewPath()
+
   // brew is not thread-safe
-  execa.sync("brew", ["install", version !== undefined && version !== "" ? `${name}@${version}` : name, ...extraArgs], {
-    stdio: "inherit",
-  })
+  execa.sync(
+    join(binDir, "brew"),
+    ["install", version !== undefined && version !== "" ? `${name}@${version}` : name, ...extraArgs],
+    {
+      stdio: "inherit",
+    }
+  )
 
-  return { binDir: "/usr/local/bin/" }
+  return { binDir }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ describe("setup-brew", () => {`
`7`	`7`	`if (process.platform !== "darwin") {`
`8`	`8`	`return`
`9`	`9`	`}`
`10`		`- const installInfo = setupBrew("", "", process.arch)`
	`10`	`+ const installInfo = await setupBrew("", "", process.arch)`
`11`	`11`	`await testBin("brew", ["--version"], installInfo?.binDir)`
`12`	`12`	`})`
`13`	`13`	`})`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ export async function setupDoxygen(version: string, setupDir: string, arch: stri`
`54`	`54`	`return installationInfo`
`55`	`55`	`}`
`56`	`56`	`case "darwin": {`
`57`		`- const installationInfo = setupBrewPack("doxygen", undefined)`
	`57`	`+ const installationInfo = await setupBrewPack("doxygen", undefined)`
`58`	`58`	`await setupGraphviz(getVersion("graphviz", undefined), "", arch)`
`59`	`59`	`return installationInfo`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ export async function setupGcc(version: string, setupDir: string, arch: string)`
`83`	`83`	`break`
`84`	`84`	`}`
`85`	`85`	`case "darwin": {`
`86`		`- installationInfo = setupBrewPack("gcc", version)`
	`86`	`+ installationInfo = await setupBrewPack("gcc", version)`
`87`	`87`	`break`
`88`	`88`	`}`
`89`	`89`	`case "linux": {`