mirror of https://github.com/aminya/setup-cpp
fix: nala installation on ubuntu
This commit is contained in:
parent
cd31ee43de
commit
6326464ed5
|
@ -4,7 +4,7 @@ FROM fedora:38 as setup-cpp-fedora
|
|||
COPY "./dist/legacy" "/usr/lib/setup-cpp/"
|
||||
|
||||
# install nodejs
|
||||
RUN dnf -y install nodejs-20 npm-9 && \
|
||||
RUN dnf -y install nodejs npm && \
|
||||
# install setup-cpp
|
||||
npm install -g setup-cpp@v0.30.1 && \
|
||||
# install the compiler and tools
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
FROM fedora:38 as setup-cpp-fedora
|
||||
|
||||
# install nodejs
|
||||
RUN dnf -y install nodejs-20 npm-9 && \
|
||||
RUN dnf -y install nodejs npm && \
|
||||
# install setup-cpp
|
||||
npm install -g setup-cpp@v0.30.1 && \
|
||||
# install the compiler and tools
|
||||
|
|
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
|
@ -157,7 +157,7 @@ export async function addAptKeyViaDownload(name: string, url: string) {
|
|||
const fileName = `/etc/apt/trusted.gpg.d/${name}`
|
||||
if (!(await pathExists(fileName))) {
|
||||
initGpg()
|
||||
await setupAptPack([{ name: "curl" }], undefined)
|
||||
await setupAptPack([{ name: "curl" }, { name: "ca-certificates" }], undefined)
|
||||
execRootSync("bash", ["-c", `curl -s ${url} | gpg --no-default-keyring --keyring gnupg-ring:${fileName} --import`])
|
||||
execRootSync("chmod", ["644", fileName])
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue