cleaner

Author: filimonov

.github/workflows/windows_mingw.yml

@@ -1,4 +1,4 @@
-name: Windows MinGW64
+name: Windows mingw
 
 on:
   push:
@@ -8,16 +8,10 @@ on:
 
 env:
   BUILD_TYPE: Release
-  GTEST_FILTER: --gtest_filter=-"*"
   CLICKHOUSE_USER: clickhouse_cpp_cicd
   CLICKHOUSE_PASSWORD: clickhouse_cpp_cicd
-  MSYS2_DIR: msys64
-  MSYS2_ARCH: x86_64
-  MSYSTEM: MINGW64
-  ARCH: win64
-  PLATFORM: x64
 
-#
+  #
   # CLICKHOUSE_HOST: localhost
   # CLICKHOUSE_PORT: 9000
   # CLICKHOUSE_USER: default
@@ -40,6 +34,14 @@ jobs:
   build:
     runs-on: windows-latest
 
+    strategy:
+      matrix:
+        include:
+          - { sys: mingw64, env: x86_64 }
+          - { sys: mingw32, env: i686 }
+          - { sys: ucrt64,  env: ucrt-x86_64 }  # Experimental!
+          - { sys: clang64, env: clang-x86_64 } # Experimental!
+
     defaults:
       run:
         shell: msys2 {0}
@@ -48,15 +50,23 @@ jobs:
     - uses: actions/checkout@v2
     - uses: msys2/setup-msys2@v2
       with:
+        msystem: ${{ matrix.sys }}
         update: true
-        install: git mingw-w64-x86_64-cmake mingw-w64-x86_64-make mingw-w64-x86_64-gcc mingw-w64-x86_64-libc++ mingw-w64-x86_64-openssl mingw-w64-x86_64-ninja mingw-w64-x86_64-wget tar mingw-w64-x86_64-ca-certificates
-        msystem: MINGW64
-          
-    - name: Configure CMake & Run build
-      run: |
-          mkdir build && cd build
-          cmake .. -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_TESTS=ON -DWITH_OPENSSL=ON
-          cmake --build .
+        install: >-
+          mingw-w64-${{matrix.env}}-cmake
+          mingw-w64-${{matrix.env}}-make
+          mingw-w64-${{matrix.env}}-gcc
+          mingw-w64-${{matrix.env}}-openssl
+          mingw-w64-${{matrix.env}}-ninja
+          mingw-w64-${{matrix.env}}-wget
+          mingw-w64-${{matrix.env}}-ca-certificates
+          tar
+
+    - name: Configure CMake
+      run: cmake -B build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_TESTS=ON
+
+    - name: Build
+      run: cmake --build build --config ${{env.BUILD_TYPE}} --target all
 
     - name: Start tls offoader proxy
       # that mimics non-secure clickhouse running on localhost
@@ -68,6 +78,7 @@ jobs:
             ./go-tlsoffloader.exe -l localhost:9000 -b github.demo.trial.altinity.cloud:9440 &
 
     - name: Test
-      run: |
-          cd build/ut
-          ./clickhouse-cpp-ut.exe
+      run: ./build/ut/clickhouse-cpp-ut.exe
+
+    - name: Test (simple)
+      run: ./build/tests/simple-test.exe