WIP CI problem

stripe2933 · May 19, 2024 · a146a66 · a146a66
1 parent ae9ec07
commit a146a66
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -21,16 +21,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup LLVM, Ninja and vcpkg
-        run: |
-          sudo apt-get install -y ninja-build
-          echo "CC=${{ matrix.compiler.c_compiler }}" >> "$GITHUB_ENV"
-          echo "CXX=${{ matrix.compiler.cxx_compiler }}" >> "$GITHUB_ENV"
+      - name: Install Vulkan SDK
+        uses: humbletim/install-vulkan-sdk@v1.1.1
 
       - name: Configure
         run: |
           mkdir build
-          cmake -S . -B build -G Ninja                                                       \
+          CC=${{ matrix.compiler.c_compiler }}                                               \
+          CXX=${{ matrix.compiler.cxx_compiler }}                                            \
+          cmake -S . -B build                                                                \
             -DCMAKE_BUILD_TYPE=Release                                                       \
             -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake \
             -DVKU_BUILD_EXAMPLES=ON

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -13,19 +13,22 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup LLVM, Ninja and vcpkg
+      - name: Setup LLVM and vcpkg
         run: |
           brew update # Ensure to use a latest version of Homebrew
-          brew install llvm ninja
+          brew install llvm
           echo "CC=$(brew --prefix llvm)/bin/clang" >> "$GITHUB_ENV"
           echo "CXX=$(brew --prefix llvm)/bin/clang++" >> "$GITHUB_ENV"
           git clone https://github.com/microsoft/vcpkg "$HOME/vcpkg"
           echo "VCPKG_ROOT=$HOME/vcpkg" >> "$GITHUB_ENV"
 
+      - name: Install Vulkan SDK
+        uses: humbletim/install-vulkan-sdk@v1.1.1
+
       - name: Configure
         run: |
           mkdir build
-          cmake -S . -B build -G Ninja                                          \
+          cmake -S . -B build                                                   \
             -DCMAKE_BUILD_TYPE=Release                                          \
             -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake \
             -DVKU_BUILD_EXAMPLES=ON

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -13,6 +13,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install Vulkan SDK
+        uses: humbletim/install-vulkan-sdk@v1.1.1
+
       - name: Configure
         run: |
           mkdir build