Merge pull request #198 from aminya/fixes [skip ci]

.terserrc.cjs

@@ -0,0 +1,2 @@
+const { buildTerserOptions } = require("terser-config-atomic/dist/builder")
+module.exports = buildTerserOptions(process.env.NODE_ENV, undefined, true)

package.json

@@ -119,8 +119,8 @@
     "setup-python": "github:actions/setup-python#v4.7.0",
     "shx": "0.3.4",
     "simple-update-notifier": "^2.0.0",
+    "terser-config-atomic": "^1.0.0",
     "time-delta": "github:aminya/time-delta#69d91a41cef28e569be9a2991129f5f7d1f0d00e",
-    "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",
     "ts-readme": "^1.1.3",
     "typescript": "^5.1.6",

packages/user-access/README.md

@@ -18,7 +18,7 @@ npm install --save user-access
 
 <!-- INSERT GENERATED DOCS START -->
 
-### `giveUserAccess` (function)
+### `grantUserWriteAccess` (function)
 
 Give the user access to the given path and its sub-directories. It changes the owner to the SUDO_USER. This allows
 the user to use the folder without sudo
@@ -27,7 +27,7 @@ the user to use the folder without sudo
 
 - path (`string`) - The path to give the user access to
 
-**returns:** void
+**returns:** Promise<void>
 
 <!-- INSERT GENERATED DOCS END -->
 

packages/user-access/src/index.ts

@@ -1,4 +1,4 @@
-import { isSudo, execRootSync } from "admina"
+import { isSudo, execRoot } from "admina"
 import { statSync } from "fs"
 
 /**
@@ -7,14 +7,14 @@ import { statSync } from "fs"
  *
  * @param path The path to give the user access to
  */
-export function giveUserAccess(path: string) {
+export async function grantUserWriteAccess(path: string) {
   if (
     (process.platform === "linux" || process.platform === "darwin") &&
     isSudo() &&
     process.env.SUDO_USER !== undefined
   ) {
     const isDirectory = statSync(path).isDirectory()
-    execRootSync("chown", [...(isDirectory ? ["-R"] : []), process.env.SUDO_USER, path], {
+    await execRoot("chown", [...(isDirectory ? ["-R"] : []), process.env.SUDO_USER, path], {
       cwd: path,
       stdio: "inherit",
       shell: true,

src/python/python.ts

@@ -276,4 +276,4 @@ async function addPythonBaseExecPrefix_raw(python: string) {
  *
  * The answer is cached for subsequent calls
  */
-export const addPythonBaseExecPrefix = memoize(addPythonBaseExecPrefix_raw)
+export const addPythonBaseExecPrefix = memoize(addPythonBaseExecPrefix_raw, { isPromise: true })

src/utils/env/addEnv.ts

@@ -6,7 +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"
+import { grantUserWriteAccess } from "user-access"
 import escapeQuote from "escape-quotes"
 import { pathExists } from "path-exists"
 
@@ -212,7 +212,7 @@ export async function finalizeCpprc() {
     writeFileSync(cpprc_path, unique_entries.join("\n"))
 
     try {
-      giveUserAccess(cpprc_path)
+      grantUserWriteAccess(cpprc_path)
     } catch {
       // ignore
     }

src/utils/env/ubuntu_version.ts

@@ -34,7 +34,7 @@ async function ubuntuVersion_raw(): Promise<number[] | null> {
 }
 
 /** Detect Ubuntu version */
-export const ubuntuVersion = memoize(ubuntuVersion_raw)
+export const ubuntuVersion = memoize(ubuntuVersion_raw, { isPromise: true })
 
 /** Detect Ubuntu version using os.version() for Ubuntu based distros */
 function detectUsingOsVersion() {

src/utils/setup/extract.ts

@@ -3,15 +3,15 @@ import { mkdirP } from "@actions/io"
 import which from "which"
 import { setupSevenZip } from "../../sevenzip/sevenzip"
 import { warning } from "ci-log"
-import { giveUserAccess } from "user-access"
+import { grantUserWriteAccess } from "user-access"
 export { extractTar, extractXar } from "@actions/tool-cache"
 
 let sevenZip: string | undefined
 
 /// Extract 7z using 7z
 export async function extract7Zip(file: string, dest: string) {
   await execa(await getSevenZip(), ["x", file, `-o${dest}`, "-y"], { stdio: "inherit" })
-  giveUserAccess(dest)
+  grantUserWriteAccess(dest)
   return dest
 }
 
@@ -55,6 +55,6 @@ export async function extractTarByExe(file: string, dest: string, flags = ["--st
     }
   }
 
-  giveUserAccess(dest)
+  grantUserWriteAccess(dest)
   return dest
 }

src/utils/setup/setupPipPack.ts

@@ -90,7 +90,7 @@ async function getPython_raw(): Promise<string> {
   }
   return pythonBin
 }
-const getPython = memoize(getPython_raw)
+const getPython = memoize(getPython_raw, { isPromise: true })
 
 async function pipHasPackage(python: string, name: string) {
   const result = await execa(python, ["-m", "pip", "-qq", "index", "versions", name], {

src/vcpkg/vcpkg.ts

@@ -2,7 +2,7 @@ import { execaSync } from "execa"
 import { notice } from "ci-log"
 import { pathExists } from "path-exists"
 import { addShExt, addShRelativePrefix, dirname, join } from "patha"
-import { giveUserAccess } from "user-access"
+import { grantUserWriteAccess } from "user-access"
 import which from "which"
 import { addPath } from "../utils/env/addEnv"
 import { hasDnf } from "../utils/env/hasDnf"
@@ -62,7 +62,7 @@ export async function setupVcpkg(_version: string, setupDir: string, _arch: stri
       stdio: "inherit",
     })
 
-    giveUserAccess(setupDir)
+    grantUserWriteAccess(setupDir)
 
     await addPath(setupDir)
     // eslint-disable-next-line require-atomic-updates