From d6cf7936825dcf981d39be2ffb07b86495aef604 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Mon, 3 Oct 2022 20:08:44 +0100 Subject: [PATCH] build: clang-12 is not supported in jammy --- .gitpod.Dockerfile | 2 -- .gitpod.yml | 17 ----------------- 2 files changed, 19 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 34dc6725..ab5f4a53 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -2,7 +2,6 @@ FROM trainiteu/gitpod-cpp # Add clang-12 and clang-15 apt repositories RUN lsb_rel=`lsb_release -cs` \ - && sudo add-apt-repository "deb http://apt.llvm.org/${lsb_rel}/ llvm-toolchain-${lsb_rel}-12 main" \ && sudo add-apt-repository "deb http://apt.llvm.org/${lsb_rel}/ llvm-toolchain-${lsb_rel}-13 main" \ && sudo add-apt-repository "deb http://apt.llvm.org/${lsb_rel}/ llvm-toolchain-${lsb_rel}-14 main" \ && sudo add-apt-repository "deb http://apt.llvm.org/${lsb_rel}/ llvm-toolchain-${lsb_rel} main" @@ -11,6 +10,5 @@ RUN lsb_rel=`lsb_release -cs` \ RUN sudo install-packages \ g++-10 \ g++-11 \ - clang-12 \ clang-13 \ clang-14 diff --git a/.gitpod.yml b/.gitpod.yml index b62aad13..632f8dc4 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -76,7 +76,6 @@ tasks: cp default gcc10 cp default gcc11 cp default gcc12 - cp default clang12 cp default clang13 cp default clang14 popd @@ -86,11 +85,6 @@ tasks: conan profile update settings.compiler.version=11 gcc11 conan profile update env.CXX=/usr/bin/g++-11 gcc11 conan profile update env.CC=/usr/bin/gcc-11 gcc11 - conan profile update settings.compiler=clang clang12 - conan profile update settings.compiler.version=12 clang12 - conan profile update settings.compiler.libcxx=libstdc++11 clang12 - conan profile update env.CXX=/usr/bin/clang++-12 clang12 - conan profile update env.CC=/usr/bin/clang-12 clang12 conan profile update settings.compiler=clang clang13 conan profile update settings.compiler.version=13 clang13 conan profile update settings.compiler.libcxx=libstdc++11 clang13 @@ -143,17 +137,6 @@ tasks: ctest -C Release ctest -C Debug echo "🛠️ gcc-12 pre-build done! You can close this terminal and use 'Build' button in the VSCode status bar for incremental builds. 🛠️" - - name: clang-12 - init: | - gp sync-await conan-init - conan install . -pr clang12 -c user.build:all=True -c user.build:skip_docs=True -b outdated - conan install . -pr clang12 -c user.build:all=True -c user.build:skip_docs=True -b outdated -s build_type=Debug - cmake --preset clang-12 -DCMAKE_C_COMPILER=/usr/bin/clang-12 -DCMAKE_CXX_COMPILER=/usr/bin/clang++-12 - cmake --build --preset clang-12-release -j - cmake --build --preset clang-12-debug -j - ctest -C Release - ctest -C Debug - echo "🛠️ clang-12 pre-build done! You can close this terminal and use 'Build' button in the VSCode status bar for incremental builds. 🛠️" - name: clang-13 init: | gp sync-await conan-init