Skip to content

Remove adding ubuntu-toolchain-r-test PPA by default #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Flamefire wants to merge 2 commits into
base: master
Choose a base branch
from
+11 −16
Open

Remove adding ubuntu-toolchain-r-test PPA by default #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4707d21
Remove adding ubuntu-toolchain-r-test PPA by default
Flamefire Dec 19, 2024
d0fcc18
Update jobs after PPA removal
Flamefire Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .drone.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ def main(ctx):
job(compiler='clang-3.9', cxxstd='11,14', os='ubuntu-18.04'),
job(compiler='clang-4.0', cxxstd='11,14', os='ubuntu-18.04'),
job(compiler='clang-5.0', cxxstd='11,14,1z', os='ubuntu-18.04'),
job(compiler='clang-6.0', cxxstd='11,14,17', os='ubuntu-18.04'),
job(compiler='clang-7', cxxstd='11,14,17', os='ubuntu-18.04'),
job(compiler='clang-8', cxxstd='11,14,17,2a', os='ubuntu-18.04'),
job(compiler='clang-9', cxxstd='11,14,17,2a', os='ubuntu-18.04'),
job(compiler='clang-10', cxxstd='11,14,17,2a', os='ubuntu-18.04'),
job(compiler='clang-6.0', cxxstd='11,14,17', os='ubuntu-20.04'),
job(compiler='clang-7', cxxstd='11,14,17', os='ubuntu-20.04'),
job(compiler='clang-8', cxxstd='11,14,17,2a', os='ubuntu-20.04'),
job(compiler='clang-9', cxxstd='11,14,17,2a', os='ubuntu-20.04'),
job(compiler='clang-10', cxxstd='11,14,17,2a', os='ubuntu-20.04'),
job(compiler='clang-11', cxxstd='11,14,17,2a', os='ubuntu-22.04'),
job(compiler='clang-12', cxxstd='11,14,17,20', os='ubuntu-22.04'),
job(compiler='clang-13', cxxstd='11,14,17,20,2b', os='ubuntu-22.04'),
Expand All @@ -46,7 +46,7 @@ def main(ctx):
job(compiler='gcc-6', cxxstd='11,14,1z', os='ubuntu-18.04'),
job(compiler='gcc-7', cxxstd='11,14,1z', os='ubuntu-18.04'),
job(compiler='gcc-8', cxxstd='11,14,17,2a', os='ubuntu-18.04'),
job(compiler='gcc-9', cxxstd='11,14,17,2a', os='ubuntu-18.04'),
job(compiler='gcc-9', cxxstd='11,14,17,2a', os='ubuntu-20.04'),
job(compiler='gcc-10', cxxstd='11,14,17,20', os='ubuntu-22.04'),
job(compiler='gcc-11', cxxstd='11,14,17,20,2b', os='ubuntu-22.04'),
job(compiler='gcc-12', cxxstd='11,14,17,20,2b', os='ubuntu-22.04'),
Expand Down Expand Up @@ -99,10 +99,10 @@ def main(ctx):
job(compiler='clang', cxxstd='11,14,17,20,2b', os='osx-xcode-15.0.1'),
# ARM64
job(compiler='clang-12', cxxstd='11,14,17,20', os='ubuntu-20.04', arch='arm64', add_llvm=True),
job(compiler='gcc-11', cxxstd='11,14,17,20', os='ubuntu-20.04', arch='arm64'),
job(compiler='gcc-11', cxxstd='11,14,17,20', os='ubuntu-22.04', arch='arm64'),
# S390x
job(compiler='clang-12', cxxstd='11,14,17,20', os='ubuntu-20.04', arch='s390x', add_llvm=True),
job(compiler='gcc-11', cxxstd='11,14,17,20', os='ubuntu-20.04', arch='s390x'),
job(compiler='gcc-11', cxxstd='11,14,17,20', os='ubuntu-22.04', arch='s390x'),
# Windows
job(compiler='msvc-14.0', cxxstd=None, os='windows', env={'B2_DONT_EMBED_MANIFEST': 1}),
job(compiler='msvc-14.1', cxxstd=None, os='windows'),
Expand Down
4 changes: 0 additions & 4 deletions ci/azure-pipelines/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@ if [ "$AGENT_OS" != "Darwin" ]; then
fi

if [ -n "$PACKAGES" ]; then
for ((i=1; i <= ${NET_RETRY_COUNT:-3}; i++)); do
# shellcheck disable=SC2015
sudo -E apt-add-repository -y "ppa:ubuntu-toolchain-r/test" && break || sleep 10
done
if [ -n "${LLVM_REPO}" ]; then
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
for ((i=1; i <= ${NET_RETRY_COUNT:-3}; i++)); do
Expand Down
7 changes: 3 additions & 4 deletions ci/drone/linux-cxx-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
#
# Copyright 2020-2022 Sam Darwin
# Copyright 2021-2024 Alexander Grund
# Copyright 2021-2026 Alexander Grund
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE_1_0.txt or copy at
# http://www.boost.org/LICENSE_1_0.txt)
Expand Down Expand Up @@ -51,11 +51,10 @@ function add_repository_toolchain {

echo ">>>>> APT: REPOSITORIES..."

if [ "$UBUNTU_TOOLCHAIN_DISABLE" != "true" ]; then
# add_repository "ppa:ubuntu-toolchain-r/test"
if [[ "${ADD_UBUNTU_TOOLCHAIN_PPA:-}" == "true" ]]; then
add_repository_toolchain "ppa:ubuntu-toolchain-r/test"
else
echo "UBUNTU_TOOLCHAIN_DISABLE is 'true'. Not installing ppa:ubuntu-toolchain-r/test"
echo "ADD_UBUNTU_TOOLCHAIN_PPA is not 'true'. Not installing ppa:ubuntu-toolchain-r/test"
fi

if [ -n "${LLVM_OS}" ]; then
Expand Down
Loading