Skip to content

Commit 9c18ad8

Browse files
committed
fix: fix apt-cache show and use gcc 11 on Ubuntu 20
1 parent fbb91d5 commit 9c18ad8

File tree

7 files changed

+15
-9
lines changed

7 files changed

+15
-9
lines changed

cspell.config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ ignorePaths:
1212
words:
1313
- aarch
1414
- clangd
15+
- Trofimovich
16+
- cobertura
1517
- aminya
1618
- applellvm
1719
- bazel

dist/node12/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/node12/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/node16/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/node16/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: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,14 @@ async function getAptArg(name: string, version: string | undefined) {
6767
if (stdout.trim() !== "") {
6868
return `${name}-${version}`
6969
} else {
70-
// check if apt-get show can find the version
71-
const { stdout: showStdout } = await execa("apt-cache", ["show", `${name}=${version}`])
72-
if (showStdout.trim() === "") {
73-
return `${name}=${version}`
70+
try {
71+
// check if apt-get show can find the version
72+
const { stdout: showStdout } = await execa("apt-cache", ["show", `${name}=${version}`])
73+
if (showStdout.trim() === "") {
74+
return `${name}=${version}`
75+
}
76+
} catch {
77+
// ignore
7478
}
7579
warning(`Failed to install ${name} ${version} via apt, trying without version`)
7680
}

src/versions/default_versions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export const DefaultVersions: Record<string, string> = {
3636
export const DefaultLinuxVersion: Record<string, Record<number, string>> = {
3737
gcc: {
3838
22: "13",
39-
20: "13",
39+
20: "11",
4040
18: "11",
4141
16: "11",
4242
14: "11",

0 commit comments

Comments
 (0)