WIP: enabled CI test using llvmpipe.

stripe2933 · Aug 31, 2024 · 2103945 · 2103945
1 parent 6407520
commit 2103945
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 36 deletions.
diff --git a/.github/workflows/build-presets.json b/.github/workflows/build-presets.json
@@ -0,0 +1,51 @@
+{
+  "version": 6,
+  "configurePresets": [
+    {
+      "name": "clang",
+      "inherits": "vcpkg",
+      "cacheVariables": {
+        "CMAKE_C_COMPILER": "/usr/bin/clang-18",
+        "CMAKE_CXX_COMPILER": "/usr/bin/clang++-18"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Linux"
+      }
+    },
+    {
+      "name": "clang-libcxx",
+      "displayName": "Clang + libc++",
+      "inherits": "clang",
+      "cacheVariables": {
+        "CMAKE_CXX_FLAGS": "-stdlib=libc++",
+        "CMAKE_EXE_LINKER_FLAGS": "-stdlib=libc++ -lc++abi"
+      }
+    },
+    {
+      "name": "msvc",
+      "displayName": "MSVC",
+      "inherits": "vcpkg",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      }
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "clang",
+      "configurePreset": "clang"
+    },
+    {
+      "name": "clang-libcxx",
+      "configurePreset": "clang-libcxx"
+    },
+    {
+      "name": "msvc",
+      "configurePreset": "msvc"
+    }
+  ]
+}
diff --git a/.github/workflows/linux-test.yml b/.github/workflows/linux-test.yml
@@ -45,9 +45,10 @@ jobs:
       - name: Apply patch for vcpkg-based dependency management
         run: git apply vcpkg-deps.patch .github/workflows/ci-fix.patch
 
-      - name: Configure and Run CTest
+      - name: Configure, Build and Run CTest
         run: |
-          mv .github/workflows/CMakeUserPresets.json .
+          mv .github/workflows/test-presets.json CMakeUserPresets.json
           cmake --preset=clang-libcxx-test \
             -DVKU_USE_STD_MODULE=ON
+          cmake --build --preset=clang-libcxx
           ctest --preset=clang-libcxx
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -54,12 +54,10 @@ jobs:
       - name: Apply patch for vcpkg-based dependency management
         run: git apply vcpkg-deps.patch .github/workflows/ci-fix.patch
 
-      - name: Configure
+      - name: Configure and Build
         run: |
-          mv .github/workflows/CMakeUserPresets.json .
+          mv .github/workflows/build-presets.json CMakeUserPresets.json
           cmake --preset=${{ matrix.use_std_module == 'ON' && 'clang-libcxx' || 'clang' }} \
             -DCMAKE_BUILD_TYPE=${{ matrix.build }} \
             -DVKU_USE_STD_MODULE=${{ matrix.use_std_module }}
-
-      - name: Install
-        run: cmake --build --preset=${{ matrix.use_std_module == 'ON' && 'clang-libcxx' || 'clang' }} --target install
+          cmake --build --preset=${{ matrix.use_std_module == 'ON' && 'clang-libcxx' || 'clang' }} --target install
diff --git a/.github/workflows/CMakeUserPresets.json → .github/workflows/test-presets.json b/.github/workflows/CMakeUserPresets.json → .github/workflows/test-presets.json
@@ -2,8 +2,16 @@
   "version": 6,
   "configurePresets": [
     {
-      "name": "clang",
+      "name": "ci-test",
+      "hidden": true,
       "inherits": "vcpkg",
+      "cacheVariables": {
+        "VKU_ENABLE_TEST": "ON"
+      }
+    },
+    {
+      "name": "clang",
+      "inherits": "ci-test",
       "cacheVariables": {
         "CMAKE_C_COMPILER": "/usr/bin/clang-18",
         "CMAKE_CXX_COMPILER": "/usr/bin/clang++-18"
@@ -26,33 +34,12 @@
     {
       "name": "msvc",
       "displayName": "MSVC",
-      "inherits": "vcpkg",
+      "inherits": "ci-test",
       "condition": {
         "type": "equals",
         "lhs": "${hostSystemName}",
         "rhs": "Windows"
       }
-    },
-    {
-      "name": "clang-test",
-      "inherits": "clang",
-      "cacheVariables": {
-        "VKU_ENABLE_TEST": "ON"
-      }
-    },
-    {
-      "name": "clang-libcxx-test",
-      "inherits": "clang-libcxx",
-      "cacheVariables": {
-        "VKU_ENABLE_TEST": "ON"
-      }
-    },
-    {
-      "name": "msvc-test",
-      "inherits": "msvc",
-      "cacheVariables": {
-        "VKU_ENABLE_TEST": "ON"
-      }
     }
   ],
   "buildPresets": [

diff --git a/.github/workflows/windows-test.yml b/.github/workflows/windows-test.yml
@@ -51,7 +51,7 @@ jobs:
 
       - name: Configure and Run CTest
         run: |
-          mv .github\workflows\CMakeUserPresets.json .\
+          mv .github\workflows\test-presets.json CMakeUserPresets.json
           cmake --preset=msvc `
             -DVKU_USE_STD_MODULE=ON
           ctest --preset=msvc
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -51,12 +51,10 @@ jobs:
       - name: Apply patch for vcpkg-based dependency management
         run: git apply vcpkg-deps.patch .github/workflows/ci-fix.patch --whitespace=fix
 
-      - name: Configure
+      - name: Configure and Build
         run: |
-          mv .github\workflows\CMakeUserPresets.json .\
+          mv .github\workflows\build-presets.json CMakeUserPresets.json
           cmake --preset=msvc `
             -DCMAKE_BUILD_TYPE=${{ matrix.build }} `
             -DVKU_USE_STD_MODULE=${{ matrix.use_std_module }}
-
-      - name: Install
-        run: cmake --build --preset=msvc --target install
+          cmake --build --preset=msvc --target install