Skip to content

Commit 5292ba1

Browse files
committed
Remove adding ubuntu-toolchain-r-test PPA by default
1 parent d89a58a commit 5292ba1

3 files changed

Lines changed: 2 additions & 8 deletions

File tree

.github/workflows/reusable.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,9 +340,6 @@ jobs:
340340
run: |
341341
SOURCE_KEYS=("${{join(matrix.source_keys, '" "')}}")
342342
SOURCES=("${{join(matrix.sources, '" "')}}")
343-
# Add this by default
344-
SOURCE_KEYS+=('http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x1E9377A2BA9EF27F')
345-
SOURCES+=(ppa:ubuntu-toolchain-r/test)
346343
347344
ci/add-apt-keys.sh "${SOURCE_KEYS[@]}"
348345
# Initial update before adding sources required to get e.g. keys

ci/azure-pipelines/install.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ if [ "$AGENT_OS" != "Darwin" ]; then
4646
fi
4747

4848
if [ -n "$PACKAGES" ]; then
49-
for i in {1..${NET_RETRY_COUNT:-3}}; do
50-
sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test" && break || sleep 10
51-
done
5249
if [ -n "${LLVM_REPO}" ]; then
5350
curl -sSL --retry ${NET_RETRY_COUNT:-5} https://apt.llvm.org/llvm-snapshot.gpg.key | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/llvm-snapshot.gpg
5451
for i in {1..${NET_RETRY_COUNT:-3}}; do

ci/drone/linux-cxx-install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ function add_repository_toolchain {
4444

4545
echo ">>>>> APT: REPOSITORIES..."
4646

47-
if [ "$UBUNTU_TOOLCHAIN_DISABLE" != "true" ]; then
47+
if [ "${ADD_UBUNTU_TOOLCHAIN_PPA:-}" == "true" ]; then
4848
# add_repository "ppa:ubuntu-toolchain-r/test"
4949
add_repository_toolchain "ppa:ubuntu-toolchain-r/test"
5050
else
51-
echo "UBUNTU_TOOLCHAIN_DISABLE is 'true'. Not installing ppa:ubuntu-toolchain-r/test"
51+
echo "UBUNTU_TOOLCHAIN_ENABLE is not 'true'. Not installing ppa:ubuntu-toolchain-r/test"
5252
fi
5353

5454
if [ -n "${LLVM_OS}" ]; then

0 commit comments

Comments
 (0)