WIP: Add CI.

stripe2933 · Jul 21, 2024 · 0a369db · 0a369db
1 parent 9577b10
commit 0a369db
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 35 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -37,30 +37,14 @@ jobs:
             core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
             core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
-      - name: Install vku
-        run: |
-          git clone https://github.com/stripe2933/vku.git
-          cd vku
-          git checkout module
-          git apply vcpkg-deps.patch
-          cmake -S . -B build -G Ninja \
-            -DCMAKE_C_COMPILER="/usr/bin/clang-18" \
-            -DCMAKE_CXX_COMPILER="/usr/bin/clang++-18" \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DCMAKE_TOOLCHAIN_FILE="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" \
-            -DVCPKG_OVERLAY_PORTS=overlays \
-            -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
-            -DCMAKE_EXE_LINKER_FLAGS="-stdlib=libc++ -lc++abi" \
-            -DVKU_USE_STD_MODULE=ON
-          sudo cmake --build build --target install --config release
-
       - name: Configure
         run: |
-          mkdir build
           cmake --preset=vcpkg \
             -DCMAKE_C_COMPILER="/usr/bin/clang-18" \
             -DCMAKE_CXX_COMPILER="/usr/bin/clang++-18" \
+            -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_TOOLCHAIN_FILE="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" \
+            -DVCPKG_OVERLAY_PORTS=overlays \
             -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
             -DCMAKE_EXE_LINKER_FLAGS="-stdlib=libc++ -lc++abi"
 

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -38,24 +38,12 @@ jobs:
             core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
             core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
-      - name: Install vku
-        run: |
-          git clone https://github.com/stripe2933/vku.git
-          cd vku
-          git checkout module
-          git apply vcpkg-deps.patch
-          cmake -S . -B build -G Ninja `
-            -DCMAKE_BUILD_TYPE=Release `
-            -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" `
-            -DVCPKG_OVERLAY_PORTS=overlays `
-            -DVKU_USE_STD_MODULE=ON
-          cmake --build build --target install --config release
-
       - name: Configure
         run: |
-          mkdir build
           cmake --preset=vcpkg `
-            -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake"
+            -DCMAKE_BUILD_TYPE=Release `
+            -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" `
+            -DVCPKG_OVERLAY_PORTS=overlays
 
       - name: Build
         run: cmake --build build --config release
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,18 @@ set(CMAKE_CXX_MODULE_STD 1)
 
 find_package(glfw3 CONFIG REQUIRED)
 find_package(glm CONFIG REQUIRED)
-find_package(vku CONFIG REQUIRED)
+
+include(FetchContent)
+
+set(VKU_USE_STD_MODULE ON)
+FetchContent_Declare(
+    vku
+    GIT_REPOSITORY https://github.com/stripe2933/vku.git
+    GIT_TAG module
+    PATCH_COMMAND git apply ${CMAKE_CURRENT_BINARY_DIR}/_deps/vku-src/vcpkg-deps.patch
+    UPDATE_DISCONNECTED 1
+)
+FetchContent_MakeAvailable(vku)
 
 # ----------------
 # Module configurations for external dependencies.

diff --git a/vcpkg.json b/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "dependencies": [
+    "glfw3",
     "glm",
-    "glfw3"
+    "vulkan-memory-allocator-hpp"
   ]
 }