From 8c73ea933cebd39b1c04169f3330aaff5955ddb9 Mon Sep 17 00:00:00 2001
From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
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 | 71 +++++----------------------------------
 1 file changed, 9 insertions(+), 62 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b3aa585bad..29dbc1117a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -148,68 +148,21 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: build-ubuntu-gcc9
-            cxx: g++-9
-          - name: build-ubuntu-gcc10
-            cxx: g++-10
-          - name: build-ubuntu-gcc10-nvcc11.4
-            cxx: g++-10
-            cuda_url: https://developer.download.nvidia.com/compute/cuda/11.4.4/local_installers/cuda_11.4.4_470.82.01_linux.run
-          - name: build-ubuntu-gcc10-nvcc11.5
-            cxx: g++-10
-            cuda_url: https://developer.download.nvidia.com/compute/cuda/11.5.2/local_installers/cuda_11.5.2_495.29.05_linux.run
-          - name: build-ubuntu-gcc10-nvcc11.6
-            cxx: g++-10
-            cuda_url: https://developer.download.nvidia.com/compute/cuda/11.6.2/local_installers/cuda_11.6.2_510.47.03_linux.run
-          - name: build-ubuntu-gcc11-asan
-            cxx: g++-11
-            asan: ON
-          - name: build-ubuntu-gcc11-nvcc11.7
-            cxx: g++-11
-            cuda_url: https://developer.download.nvidia.com/compute/cuda/11.7.1/local_installers/cuda_11.7.1_515.65.01_linux.run
-          - name: build-ubuntu-gcc11-nvcc11.8
-            cxx: g++-11
-            cuda_url: https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda_11.8.0_520.61.05_linux.run
-          - name: build-ubuntu-gcc12
-            cxx: g++-12
-            install_extra: g++-12
-          - name: build-ubuntu-gcc12-nvcc12.0
-            cxx: g++-12
-            install_extra: g++-12
-            cuda_url: https://developer.download.nvidia.com/compute/cuda/12.0.1/local_installers/cuda_12.0.1_525.85.12_linux.run
-          - name: build-ubuntu-gcc12-nvcc12.1
-            cxx: g++-12
-            install_extra: g++-12
-            cuda_url: https://developer.download.nvidia.com/compute/cuda/12.1.1/local_installers/cuda_12.1.1_530.30.02_linux.run
-          - name: build-ubuntu-gcc12-nvcc12.2-asan
-            cxx: g++-12
-            install_extra: g++-12
-            cuda_url: https://developer.download.nvidia.com/compute/cuda/12.2.1/local_installers/cuda_12.2.1_535.86.10_linux.run
-            asan: ON
-          - name: build-ubuntu-gcc12-nvcc12.3
-            cxx: g++-12
-            install_extra: g++-12
-            cuda_url: https://developer.download.nvidia.com/compute/cuda/12.3.0/local_installers/cuda_12.3.0_545.23.06_linux.run
-          - name: build-ubuntu-gcc13-asan
-            cxx: g++-13
-            add_toolchain_repo: true
-            asan: ON
-            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++-11
           - 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++-11
           - 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++-11
           - 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++-11
           - 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++-11
             add_llvm_repo: true
           - name: build-ubuntu-clang16
             cxx: clang++-16
@@ -227,15 +180,6 @@ jobs:
             install_extra: clang-17 libomp-17-dev
             add_llvm_repo: true
             asan: ON
-          - name: build-ubuntu-icpx
-            cxx: icpx
-            add_oneapi_repo: true
-            install_extra: intel-oneapi-compiler-dpcpp-cpp g++-12 # for libstdc++
-            cxx_flags: --gcc-install-dir=/usr/lib/gcc/x86_64-linux-gnu/12
-          - name: build-ubuntu-nvc++
-            cxx: /opt/nvidia/hpc_sdk/Linux_x86_64/23.5/compilers/bin/nvc++
-            add_nvcpp_repo: true
-            install_extra: nvhpc-23-5
 
     steps:
       - uses: actions/checkout@v3
@@ -314,7 +258,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