Skip to content

Commit ee26599

Browse files
committed
fix: use node-download-helper instead of actions/http-client and curl
1 parent a247573 commit ee26599

File tree

12 files changed

+155
-138
lines changed

12 files changed

+155
-138
lines changed

dist/actions/setup-cpp.js

Lines changed: 36 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/actions/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/legacy/setup-cpp.js

Lines changed: 36 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/legacy/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/modern/setup-cpp.js

Lines changed: 36 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/modern/setup-cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@
126126
"untildify-user": "workspace:*",
127127
"util.types": "^0.0.2",
128128
"web-streams-polyfill": "^4.0.0",
129-
"which": "^4.0.0"
129+
"which": "^4.0.0",
130+
"node-downloader-helper": "2.1.9"
130131
},
131132
"productionDependencies": [
132133
"@actions/core",
@@ -148,6 +149,7 @@
148149
"micro-memoize",
149150
"mri",
150151
"msvc-dev-cmd",
152+
"node-downloader-helper",
151153
"numerous",
152154
"envosman",
153155
"path-exists",

packages/setup-apt/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
"envosman": "workspace:*",
2424
"which": "4.0.0",
2525
"execa": "^7.2.0",
26-
"escape-string-regexp": "^5.0.0"
26+
"escape-string-regexp": "^5.0.0",
27+
"node-downloader-helper": "2.1.9"
2728
},
2829
"engines": {
2930
"node": ">=12"

packages/setup-apt/src/apt-key.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import { tmpdir } from "os"
12
import { execRoot, execRootSync } from "admina"
23
import { warning } from "ci-log"
3-
import { execa } from "execa"
4+
import { DownloaderHelper } from "node-downloader-helper"
45
import { pathExists } from "path-exists"
5-
import { installAptPack } from "./install.js"
66

77
function initGpg() {
88
execRootSync("gpg", ["-k"])
@@ -53,8 +53,13 @@ export async function addAptKeyViaDownload(name: string, url: string) {
5353
const fileName = `/etc/apt/trusted.gpg.d/${name}`
5454
if (!(await pathExists(fileName))) {
5555
initGpg()
56-
await installAptPack([{ name: "curl" }, { name: "ca-certificates" }], undefined)
57-
await execa("curl", ["-s", url, "-o", `/tmp/${name}`])
56+
57+
const dl = new DownloaderHelper(url, tmpdir(), { fileName: name })
58+
dl.on("error", (err) => {
59+
throw new Error(`Failed to download ${url}: ${err}`)
60+
})
61+
await dl.start()
62+
5863
execRootSync("gpg", ["--no-default-keyring", "--keyring", `gnupg-ring:${fileName}`, "--import", `/tmp/${name}`])
5964
execRootSync("chmod", ["644", fileName])
6065
}

pnpm-lock.yaml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)