Skip to content

Commit 6326464

Browse files
committed
fix: nala installation on ubuntu
1 parent cd31ee4 commit 6326464

File tree

9 files changed

+9
-9
lines changed

9 files changed

+9
-9
lines changed

dev/docker/__tests__/fedora.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM fedora:38 as setup-cpp-fedora
44
COPY "./dist/legacy" "/usr/lib/setup-cpp/"
55

66
# install nodejs
7-
RUN dnf -y install nodejs-20 npm-9 && \
7+
RUN dnf -y install nodejs npm && \
88
# install setup-cpp
99
npm install -g setup-cpp@v0.30.1 && \
1010
# install the compiler and tools

dev/docker/setup-cpp-fedora.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
FROM fedora:38 as setup-cpp-fedora
33

44
# install nodejs
5-
RUN dnf -y install nodejs-20 npm-9 && \
5+
RUN dnf -y install nodejs npm && \
66
# install setup-cpp
77
npm install -g setup-cpp@v0.30.1 && \
88
# install the compiler and tools

dist/actions/setup-cpp.js

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/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: 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.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: 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.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.

src/utils/setup/setupAptPack.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ export async function addAptKeyViaDownload(name: string, url: string) {
157157
const fileName = `/etc/apt/trusted.gpg.d/${name}`
158158
if (!(await pathExists(fileName))) {
159159
initGpg()
160-
await setupAptPack([{ name: "curl" }], undefined)
160+
await setupAptPack([{ name: "curl" }, { name: "ca-certificates" }], undefined)
161161
execRootSync("bash", ["-c", `curl -s ${url} | gpg --no-default-keyring --keyring gnupg-ring:${fileName} --import`])
162162
execRootSync("chmod", ["644", fileName])
163163
}

0 commit comments

Comments
 (0)