From 71eabdd8d6992cc55ab5e6004c955a70cb0d5331 Mon Sep 17 00:00:00 2001 From: Bernhard Manfred Gruber Date: Mon, 13 Nov 2023 16:41:05 +0100 Subject: [PATCH] Remove libstdc++-13-dev in clang 11-15 CI This works around these clang versions failing to compile libstdc++ from g++-13. --- .github/workflows/ci.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b3aa585bad..2f029395de 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -197,19 +197,19 @@ jobs: install_extra: g++-13 - name: build-ubuntu-clang11 cxx: clang++-11 - install_extra: clang-11 libomp-11-dev + install_extra: clang-11 libomp-11-dev libstdc++-13-dev- g++-12 - name: build-ubuntu-clang12 cxx: clang++-12 - install_extra: clang-12 libomp-12-dev + install_extra: clang-12 libomp-12-dev libstdc++-13-dev- g++-12 - name: build-ubuntu-clang13 cxx: clang++-13 - install_extra: clang-13 libomp-13-dev + install_extra: clang-13 libomp-13-dev libstdc++-13-dev- g++-12 - name: build-ubuntu-clang14 cxx: clang++-14 - install_extra: clang-14 libomp-14-dev + install_extra: clang-14 libomp-14-dev libstdc++-13-dev- g++-12 - name: build-ubuntu-clang15 cxx: clang++-15 - install_extra: clang-15 libomp-15-dev + install_extra: clang-15 libomp-15-dev libstdc++-13-dev- g++-12 add_llvm_repo: true - name: build-ubuntu-clang16 cxx: clang++-16 @@ -314,7 +314,10 @@ jobs: -DCMAKE_CUDA_HOST_COMPILER=$CXX \ -DCMAKE_CXX_FLAGS="$CXX_FLAGS" \ -DCMAKE_CUDA_FLAGS="${{ matrix.cuda_flags }}" \ - -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake + -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake || true + + cat /usr/local/share/vcpkg/buildtrees/detect_compiler/config-x64-linux-rel-out.log || true + cat /usr/local/share/vcpkg/buildtrees/detect_compiler/config-x64-linux-rel-err.log || true - name: build tests + examples run: | if [ ${{ matrix.add_oneapi_repo }} ]; then source /opt/intel/oneapi/setvars.sh; fi