From 88356a9f25c3a2cef807f0f7e0c17aeb5678cb52 Mon Sep 17 00:00:00 2001 From: Mikhail Koliada Date: Mon, 29 Apr 2024 13:45:26 +0200 Subject: [PATCH] [Ubuntu] remove toolchain test repo --- images/ubuntu/scripts/build/install-gcc-compilers.sh | 7 ------- images/ubuntu/scripts/build/install-gfortran.sh | 7 ------- images/ubuntu/toolsets/toolset-2204.json | 6 ++---- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/images/ubuntu/scripts/build/install-gcc-compilers.sh b/images/ubuntu/scripts/build/install-gcc-compilers.sh index ac0b91909c1..642b80dfd44 100644 --- a/images/ubuntu/scripts/build/install-gcc-compilers.sh +++ b/images/ubuntu/scripts/build/install-gcc-compilers.sh @@ -5,15 +5,8 @@ ################################################################################ # Source the helpers for use with the script -source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh -# Install GNU C++ compiler -if ! is_ubuntu24 ; then - add-apt-repository ppa:ubuntu-toolchain-r/test -y - apt-get update -y -fi - versions=$(get_toolset_value '.gcc.versions[]') for version in ${versions[*]}; do diff --git a/images/ubuntu/scripts/build/install-gfortran.sh b/images/ubuntu/scripts/build/install-gfortran.sh index fe2e16c1515..78d3d23a7ce 100644 --- a/images/ubuntu/scripts/build/install-gfortran.sh +++ b/images/ubuntu/scripts/build/install-gfortran.sh @@ -6,13 +6,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -source $HELPER_SCRIPTS/os.sh - -# Install GNU Fortran compiler -if ! is_ubuntu24 ; then - add-apt-repository ppa:ubuntu-toolchain-r/test -y - apt-get update -y -fi versions=$(get_toolset_value '.gfortran.versions[]') diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json index b36e575a2fd..60c7997a997 100644 --- a/images/ubuntu/toolsets/toolset-2204.json +++ b/images/ubuntu/toolsets/toolset-2204.json @@ -292,16 +292,14 @@ "versions": [ "g++-9", "g++-10", - "g++-12", - "g++-13" + "g++-12" ] }, "gfortran": { "versions": [ "gfortran-9", "gfortran-10", - "gfortran-12", - "gfortran-13" + "gfortran-12" ] }, "php": {