DRAFT 605 - test GH Actions with some fixes

ivmai · Nov 11, 2023 · a98937b · a98937b
1 parent 57be926
commit a98937b
Show file tree

Hide file tree

Showing 13 changed files with 113 additions and 1,064 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
diff --git a/.github/workflows/cmake-build.yml b/.github/workflows/cmake-build.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 
 jobs:
   build:
-    name: ${{ matrix.os }} ${{ matrix.c_compiler }} thr:${{ matrix.enable_threads }} redir:${{ matrix.redirect_malloc }} dll:${{ matrix.shared_libs }}
+    name: ${{ matrix.os }} ${{ matrix.c_compiler }} thr:${{ matrix.enable_threads }} rwlock::${{ matrix.enable_rwlock }} redir:${{ matrix.redirect_malloc }} dll:${{ matrix.shared_libs }}
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -15,14 +15,32 @@ jobs:
       matrix:
         os: [ macos-latest, ubuntu-latest, windows-latest ]
         c_compiler: [ cl, clang, gcc ]
+        cxx_compiler: [ cl, clang++, g++ ]
         build_type: [ Release ]
         disable_gc_debug: [ off ]
-        gc_assertions: [ off ]
-        large_config: [ off ]
-        enable_threads: [ off, on ]
-        redirect_malloc: [ off, on ]
+        gc_assertions: [ on ]
+        large_config: [ on ]
+        enable_threads: [ off ] #, on ]
+        enable_rwlock: [ off, on ]
+        redirect_malloc: [ off ] #, on ]
         shared_libs: [ off, on ]
         exclude:
+        - c_compiler: cl
+          cxx_compiler: clang++
+        - c_compiler: cl
+          cxx_compiler: g++
+        - c_compiler: clang
+          cxx_compiler: cl
+        - c_compiler: clang
+          cxx_compiler: g++
+        - c_compiler: gcc
+          cxx_compiler: cl
+        - c_compiler: gcc
+          cxx_compiler: clang++
+        - enable_threads: off
+          enable_rwlock: on
+        - enable_threads: on
+          redirect_malloc: on
         - os: macos-latest
           c_compiler: cl
         - os: macos-latest
@@ -32,26 +50,13 @@ jobs:
         - os: windows-latest # TODO: support dependency on libatomic_ops
           c_compiler: cl
           enable_threads: on
-        - os: windows-latest # TODO: enable following
-          c_compiler: clang
-        - os: macos-latest
-          c_compiler: clang
-          enable_threads: on
-          redirect_malloc: on
-        - os: windows-latest
-          c_compiler: cl
-          enable_threads: off
-          redirect_malloc: on
-        - os: windows-latest
-          c_compiler: gcc
-          enable_threads: on
         include:
         - os: windows-latest
           c_compiler: gcc
           cmake_generator_opt: '-G "Unix Makefiles"'
-        #- os: windows-latest
-        #  c_compiler: clang
-        #  cmake_generator_opt: '-G "Unix Makefiles"'
+        - os: windows-latest
+          c_compiler: clang
+          cmake_generator_opt: '-G "Unix Makefiles"'
 
     steps:
     - uses: actions/checkout@v4
@@ -70,13 +75,16 @@ jobs:
         ${{ matrix.cmake_generator_opt }}
         -DBUILD_SHARED_LIBS=${{ matrix.shared_libs }}
         -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
+        -DCMAKE_CXX_COMPILER=${{ matrix.cxx_compiler }}
         -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
         -Dbuild_tests=ON
+        -Denable_cplusplus=ON
         -Ddisable_gc_debug=${{ matrix.disable_gc_debug }}
         -Denable_gc_assertions=${{ matrix.gc_assertions }}
         -Denable_large_config=${{ matrix.large_config }}
         -Denable_redirect_malloc=${{ matrix.redirect_malloc }}
         -Denable_threads=${{ matrix.enable_threads }}
+        -Denable_rwlock=${{ matrix.enable_rwlock }}
         -Denable_werror=ON
         -Werror=dev
         -S ${{ github.workspace }}