Merge pull request #262 from aminya/downloader [skip ci]

Author: aminya

dist/actions/setup-cpp.js

@@ -126,7 +126,8 @@
     "untildify-user": "workspace:*",
     "util.types": "^0.0.2",
     "web-streams-polyfill": "^4.0.0",
-    "which": "^4.0.0"
+    "which": "^4.0.0",
+    "node-downloader-helper": "2.1.9"
   },
   "productionDependencies": [
     "@actions/core",
@@ -148,6 +149,7 @@
     "micro-memoize",
     "mri",
     "msvc-dev-cmd",
+    "node-downloader-helper",
     "numerous",
     "envosman",
     "path-exists",

dist/actions/setup-cpp.js.map

@@ -23,7 +23,8 @@
     "envosman": "workspace:*",
     "which": "4.0.0",
     "execa": "^7.2.0",
-    "escape-string-regexp": "^5.0.0"
+    "escape-string-regexp": "^5.0.0",
+    "node-downloader-helper": "2.1.9"
   },
   "engines": {
     "node": ">=12"

dist/legacy/setup-cpp.js

@@ -1,6 +1,7 @@
+import { tmpdir } from "os"
 import { execRoot, execRootSync } from "admina"
 import { warning } from "ci-log"
-import { execa } from "execa"
+import { DownloaderHelper } from "node-downloader-helper"
 import { pathExists } from "path-exists"
 import { installAptPack } from "./install.js"
 
@@ -53,8 +54,14 @@ export async function addAptKeyViaDownload(name: string, url: string) {
   const fileName = `/etc/apt/trusted.gpg.d/${name}`
   if (!(await pathExists(fileName))) {
     initGpg()
-    await installAptPack([{ name: "curl" }, { name: "ca-certificates" }], undefined)
-    await execa("curl", ["-s", url, "-o", `/tmp/${name}`])
+
+    await installAptPack([{ name: "ca-certificates" }])
+    const dl = new DownloaderHelper(url, tmpdir(), { fileName: name })
+    dl.on("error", (err) => {
+      throw new Error(`Failed to download ${url}: ${err}`)
+    })
+    await dl.start()
+
     execRootSync("gpg", ["--no-default-keyring", "--keyring", `gnupg-ring:${fileName}`, "--import", `/tmp/${name}`])
     execRootSync("chmod", ["644", fileName])
   }