mirror of https://github.com/aminya/setup-cpp
fix: install ca-certificates before downloading
This commit is contained in:
parent
ee265991bc
commit
8a5b753ad5
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -3,6 +3,7 @@ import { execRoot, execRootSync } from "admina"
|
||||||
import { warning } from "ci-log"
|
import { warning } from "ci-log"
|
||||||
import { DownloaderHelper } from "node-downloader-helper"
|
import { DownloaderHelper } from "node-downloader-helper"
|
||||||
import { pathExists } from "path-exists"
|
import { pathExists } from "path-exists"
|
||||||
|
import { installAptPack } from "./install.js"
|
||||||
|
|
||||||
function initGpg() {
|
function initGpg() {
|
||||||
execRootSync("gpg", ["-k"])
|
execRootSync("gpg", ["-k"])
|
||||||
|
@ -54,6 +55,7 @@ export async function addAptKeyViaDownload(name: string, url: string) {
|
||||||
if (!(await pathExists(fileName))) {
|
if (!(await pathExists(fileName))) {
|
||||||
initGpg()
|
initGpg()
|
||||||
|
|
||||||
|
await installAptPack([{ name: "ca-certificates" }])
|
||||||
const dl = new DownloaderHelper(url, tmpdir(), { fileName: name })
|
const dl = new DownloaderHelper(url, tmpdir(), { fileName: name })
|
||||||
dl.on("error", (err) => {
|
dl.on("error", (err) => {
|
||||||
throw new Error(`Failed to download ${url}: ${err}`)
|
throw new Error(`Failed to download ${url}: ${err}`)
|
||||||
|
|
|
@ -3,6 +3,7 @@ import { addPath } from "envosman"
|
||||||
import { execaSync } from "execa"
|
import { execaSync } from "execa"
|
||||||
import { DownloaderHelper } from "node-downloader-helper"
|
import { DownloaderHelper } from "node-downloader-helper"
|
||||||
import { dirname } from "patha"
|
import { dirname } from "patha"
|
||||||
|
import { installAptPack } from "setup-apt"
|
||||||
import which from "which"
|
import which from "which"
|
||||||
import { rcOptions } from "../cli-options.js"
|
import { rcOptions } from "../cli-options.js"
|
||||||
|
|
||||||
|
@ -29,6 +30,7 @@ export async function setupBrew(_version: string, _setupDir: string, _arch: stri
|
||||||
}
|
}
|
||||||
|
|
||||||
// download the installation script
|
// download the installation script
|
||||||
|
await installAptPack([{ name: "ca-certificates" }])
|
||||||
const dl = new DownloaderHelper("https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh", tmpdir(), {
|
const dl = new DownloaderHelper("https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh", tmpdir(), {
|
||||||
fileName: "install-brew.sh",
|
fileName: "install-brew.sh",
|
||||||
})
|
})
|
||||||
|
|
|
@ -24,6 +24,7 @@ export async function setupLLVMApt(
|
||||||
const installationFolder = `/usr/lib/llvm-${majorVersion}`
|
const installationFolder = `/usr/lib/llvm-${majorVersion}`
|
||||||
|
|
||||||
// download the installation script
|
// download the installation script
|
||||||
|
await installAptPack([{ name: "ca-certificates" }])
|
||||||
const dl = new DownloaderHelper("https://apt.llvm.org/llvm.sh", tmpdir(), { fileName: "llvm.sh" })
|
const dl = new DownloaderHelper("https://apt.llvm.org/llvm.sh", tmpdir(), { fileName: "llvm.sh" })
|
||||||
dl.on("error", (err) => {
|
dl.on("error", (err) => {
|
||||||
throw new Error(`Failed to download the LLVM installer script: ${err}`)
|
throw new Error(`Failed to download the LLVM installer script: ${err}`)
|
||||||
|
|
Loading…
Reference in New Issue