From 4707d21c26c9c34600a19185821c97d0b6ce748b Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 19 Dec 2024 10:08:05 +0100 Subject: [PATCH 1/2] Remove adding ubuntu-toolchain-r-test PPA by default --- ci/azure-pipelines/install.sh | 4 ---- ci/drone/linux-cxx-install.sh | 7 +++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ci/azure-pipelines/install.sh b/ci/azure-pipelines/install.sh index b44865ea..76c95450 100755 --- a/ci/azure-pipelines/install.sh +++ b/ci/azure-pipelines/install.sh @@ -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 diff --git a/ci/drone/linux-cxx-install.sh b/ci/drone/linux-cxx-install.sh index f69e87aa..307a8ce9 100755 --- a/ci/drone/linux-cxx-install.sh +++ b/ci/drone/linux-cxx-install.sh @@ -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) @@ -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 From d0fcc1839851dcbacaa8d343603ac82f15758a0e Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 19 Dec 2024 11:29:29 +0100 Subject: [PATCH 2/2] Update jobs after PPA removal --- .drone.star | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.drone.star b/.drone.star index 369f62e8..a80d12ca 100644 --- a/.drone.star +++ b/.drone.star @@ -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'), @@ -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'), @@ -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'),