From 6518af01c618ee6384973d6e100aebe719a46581 Mon Sep 17 00:00:00 2001
From: John Wellbelove <jwellbelove@users.noreply.github.com>
Date: Mon, 12 Sep 2022 00:23:28 +0100
Subject: [PATCH] Attempt to fix clang CI error

---
 .github/workflows/clang.yml | 124 +++++++++++++++++++++++++++++++++++-
 1 file changed, 123 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml
index 1a278584..73ab4767 100644
--- a/.github/workflows/clang.yml
+++ b/.github/workflows/clang.yml
@@ -1,11 +1,87 @@
 name: clang
 on:
   push:
-    branches: [ hotfix/attempt-to-fix-clang-ci-error ]
+    branches: [ master ]
   pull_request:
     branches: [ master ]
 
 jobs:
+  build-clang-9-linux-stl:
+    name: Clang-9 Linux - STL
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-20.04]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Build
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y "clang-9" "lldb-9" "lld-9" "clang-format-9"
+        export CC=clang-9
+        export CXX=clang++-9
+        export ASAN_OPTIONS=alloc_dealloc_mismatch=0,detect_leaks=0
+        git fetch --tags
+        cmake -D BUILD_TESTS=ON -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF ./
+        clang --version
+        make
+
+    - name: Run tests
+      run: ./test/etl_tests
+
+  build-clang-9-linux-no-stl:
+    name: Clang-9 Linux - No STL
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-20.04]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Build
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y "clang-9" "lldb-9" "lld-9" "clang-format-9"
+        export CC=clang-9
+        export CXX=clang++-9
+        export ASAN_OPTIONS=alloc_dealloc_mismatch=0,detect_leaks=0
+        git fetch --tags
+        cmake -DBUILD_TESTS=ON -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF ./
+        gcc --version
+        cmake -D BUILD_TESTS=ON -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF ./
+        clang --version
+        make
+    
+    - name: Run tests
+      run: ./test/etl_tests
+
+  build-clang-9-linux-stl-force-cpp03:
+    name: Clang-9 Linux - STL - Force C++03
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-20.04]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Build
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y "clang-9" "lldb-9" "lld-9" "clang-format-9"
+        export CC=clang-9
+        export CXX=clang++-9
+        export ASAN_OPTIONS=alloc_dealloc_mismatch=0,detect_leaks=0
+        git fetch --tags
+        cmake -D BUILD_TESTS=ON -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=ON ./
+        clang --version
+        make
+
+    - name: Run tests
+      run: ./test/etl_tests
 
   build-clang-10-osx-stl:
     name: Clang-10 OSX - STL
@@ -30,3 +106,49 @@ jobs:
     - name: Run tests
       run: ./test/etl_tests
 
+  build-clang-10-osx-no-stl:
+    name: Clang-10 OSX - No STL
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-11]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Build
+      run: |
+        export CC=clang
+        export CXX=clang++
+        export ASAN_OPTIONS=alloc_dealloc_mismatch=0,detect_leaks=0
+        git fetch --tags
+        cmake -D BUILD_TESTS=ON -DNO_STL=ON -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=OFF ./
+        clang --version
+        make
+
+    - name: Run tests
+      run: ./test/etl_tests
+
+  build-clang-10-osx-stl-force-cpp03:
+    name: Clang-10 OSX - STL - Force C++03
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-11]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Build
+      run: |
+        export CC=clang
+        export CXX=clang++
+        export ASAN_OPTIONS=alloc_dealloc_mismatch=0,detect_leaks=0
+        git fetch --tags
+        cmake -D BUILD_TESTS=ON -DNO_STL=OFF -DETL_USE_TYPE_TRAITS_BUILTINS=OFF -DETL_USER_DEFINED_TYPE_TRAITS=OFF -DETL_FORCE_TEST_CPP03=ON ./
+        clang --version
+        make
+
+    - name: Run tests
+      run: ./test/etl_tests
+