Skip to content

Commit 76832b8

Browse files
committed
fix: add keys to keyserver for installing gcc
1 parent 2d754de commit 76832b8

File tree

4 files changed

+7
-16
lines changed

4 files changed

+7
-16
lines changed

dist/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/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/gcc/gcc.ts

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,27 +43,15 @@ export async function setupGcc(version: string, _setupDir: string, arch: string)
4343
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe",
4444
"ppa:ubuntu-toolchain-r/test",
4545
])
46-
binDir = (
47-
await setupAptPack("g++", version, [
48-
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial main",
49-
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe",
50-
"ppa:ubuntu-toolchain-r/test",
51-
])
52-
).binDir
46+
binDir = (await setupAptPack("g++", version, [])).binDir
5347
} else {
5448
info(`Install g++-multilib because gcc for ${arch} was requested`)
5549
await setupAptPack("gcc-multilib", version, [
5650
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial main",
5751
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe",
5852
"ppa:ubuntu-toolchain-r/test",
5953
])
60-
binDir = (
61-
await setupAptPack("g++-multilib", version, [
62-
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial main",
63-
"deb http://dk.archive.ubuntu.com/ubuntu/ xenial universe",
64-
"ppa:ubuntu-toolchain-r/test",
65-
])
66-
).binDir
54+
binDir = (await setupAptPack("g++-multilib", version, [])).binDir
6755
}
6856
break
6957
}

src/utils/setup/setupAptPack.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ export async function setupAptPack(
3737
"ca-certificates",
3838
"gnupg",
3939
])
40+
await execSudo("apt-key", ["adv", "--keyserver", "keyserver.ubuntu.com", "--recv-keys", "3B4FE6ACC0B21F32"])
41+
await execSudo("apt-key", ["adv", "--keyserver", "keyserver.ubuntu.com", "--recv-keys", "40976EAF437D05B5"])
42+
await execSudo("apt-key", ["adv", "--keyserver", "keyserver.ubuntu.com", "--recv-keys", "1E9377A2BA9EF27F"])
4043
didInit = true
4144
}
4245

0 commit comments

Comments
 (0)