Skip to content

Commit 6f50834

Browse files
authored
Rollup merge of #58404 - euclio:cloudabi-keyserver, r=alexcrichton
use Ubuntu keyserver for CloudABI ports The Ubuntu keyserver is more reliable than the MIT PGP server, which is prone to going down. This commit also explicitly uses port 80 on the keyserver for reasons outlined in #57844.
2 parents 858258a + 8b21a55 commit 6f50834

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

src/ci/docker/dist-various-2/build-cloudabi-toolchain.sh

+4-5
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ ln -s ../lib/llvm-5.0/bin/lld /usr/bin/${target}-ld
3232
ln -s ../../${target} /usr/lib/llvm-5.0/${target}
3333

3434
# Install the C++ runtime libraries from CloudABI Ports.
35-
echo deb https://nuxi.nl/distfiles/cloudabi-ports/debian/ cloudabi cloudabi > \
36-
/etc/apt/sources.list.d/cloudabi.list
37-
curl 'https://pgp.mit.edu/pks/lookup?op=get&search=0x0DA51B8531344B15' | \
38-
apt-key add -
35+
apt-key adv --batch --yes --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0DA51B8531344B15
36+
add-apt-repository -y 'deb https://nuxi.nl/distfiles/cloudabi-ports/debian/ cloudabi cloudabi'
37+
3938
apt-get update
40-
apt-get install -y $(echo ${target} | sed -e s/_/-/g)-cxx-runtime
39+
apt-get install -y "${target//_/-}-cxx-runtime"

0 commit comments

Comments
 (0)