From c27f14479b246d68aa07f0513f9343206275e199 Mon Sep 17 00:00:00 2001
From: John Wellbelove <github@wellbelove.co.uk>
Date: Wed, 30 Sep 2020 11:27:44 +0100
Subject: [PATCH] Add VS2019 configuration to Github CI

---
 .github/workflows/main.yml | 128 ++++++++++++++++++++++++++-----------
 1 file changed, 92 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1acff0b3..586b0cd8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,44 +1,12 @@
 name: CI
 on:
   push:
+    branches: [ 
     branches: [ feature/github-actions-for-windows-compilers ]
   pull_request:
     branches: [ master ]
 
 jobs:
-
-Windows:
-    name: build-windows-vs2019
-    runs-on: [windows]
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-      with:
-          submodules: recursive
-
-    - name: Installing vcpkg
-      run: |
-        cd ..
-        git clone https://github.com/Microsoft/vcpkg.git
-        cd vcpkg
-        git checkout --force 2020.01
-        .\bootstrap-vcpkg.bat
-        .\vcpkg.exe install cppzmq:x64-windows
-
-    - name: Build and run
-      run: |
-        cd ${{ github.workspace }}
-        mkdir build
-        cd build
-        cmake .. -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}
-                  /../vcpkg/scripts/buildsystems/vcpkg.cmake
-        cd build
-        MSBuild.exe etl.sln /property:Configuration=Debug
-
-    - name: Run tests
-      run: ./test/etl_tests
-
   build-gcc-linux:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -48,7 +16,7 @@ Windows:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Build and run
+    - name: Build
       run: |
         cmake -DBUILD_TESTS=ON ./
         gcc --version
@@ -57,6 +25,24 @@ Windows:
     - name: Run tests
       run: ./test/etl_tests
 
+  build-gcc-linux-no-stl:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-18.04, ubuntu-20.04]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Build
+      run: |
+        cmake -DBUILD_TESTS=ON -DNO_STL=ON ./
+        gcc --version
+        make
+    
+    - name: Run tests
+      run: ./test/etl_tests
+
   build-clang-9-linux:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -66,7 +52,7 @@ Windows:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Build and run
+    - name: Build
       run: |
         export CC=clang-9
         export CXX=clang++-9
@@ -77,6 +63,26 @@ Windows:
     - name: Run tests
       run: ./test/etl_tests
 
+  build-clang-9-linux-no-stl:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-18.04]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Build
+      run: |
+        export CC=clang-9
+        export CXX=clang++-9
+        cmake -D BUILD_TESTS=ON -DNO_STL=ON ./
+        clang --version
+        make
+
+    - name: Run tests
+      run: ./test/etl_tests
+
   build-clang-10-osx:
     runs-on: ${{ matrix.os }}
     strategy:
@@ -86,7 +92,7 @@ Windows:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Build and run
+    - name: Build
       run: |
         export CC=clang
         export CXX=clang++
@@ -97,3 +103,53 @@ Windows:
     - name: Run tests
       run: ./test/etl_tests
 
+  build-clang-10-osx-no-stl:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-10.15]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Build
+      run: |
+        export CC=clang
+        export CXX=clang++
+        cmake -D BUILD_TESTS=ON -DNO_STL=ON ./
+        clang --version
+        make
+
+    - name: Run tests
+      run: ./test/etl_tests
+
+  build-windows-vs2019:
+    runs-on: [windows]
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        submodules: recursive
+
+    - name: Installing vcpkg
+      run: |
+        cd ..
+        git clone https://github.com/Microsoft/vcpkg.git
+        cd vcpkg
+        git checkout --force 2020.01
+        .\bootstrap-vcpkg.bat
+        .\vcpkg.exe install cppzmq:x64-windows
+
+    - name: Build
+      run: |
+        cd ${{ github.workspace }}
+        mkdir build
+        cd build
+        cmake .. -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}
+                  /../vcpkg/scripts/buildsystems/vcpkg.cmake
+        cd build
+        MSBuild.exe etl.sln /property:Configuration=Debug
+
+    - name: Run tests
+      run: ./test/etl_tests