Trying to fix GitHub workflows

cg-tuwien · Apr 12, 2024 · 081f9e8 · 081f9e8
1 parent 4cdd8e2
commit 081f9e8
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -63,7 +63,7 @@ jobs:
 
           # Install dependencies
           sudo apt-get install -y \
-            vulkan-sdk
+            vulkan-sdk \
             g++-13 \
             gcc-13
 
@@ -91,7 +91,7 @@ jobs:
         shell: bash
         working-directory: ${{ runner.workspace }}/build
         # Execute the build.  You can specify a specific target with "--target <NAME>"
-        run: cmake --build . --config $BUILD_TYPE
+        run: cmake --build .
 
   windows:
     name: ${{ matrix.config.name }}, windows-2019, VulkanSDK ${{ matrix.vulkan-sdk }}, VMA=${{ matrix.vma }}
@@ -119,7 +119,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Create Build Environment
-        # apparently checkout@v2 pulls to Auto-Vk/Auto-Vk on windows
+        # apparently checkout@v3 pulls to Auto-Vk/Auto-Vk on windows
         working-directory: ${{ runner.workspace }}/${{ github.event.repository.name }}
         shell: pwsh
         # Some projects don't allow in-source building, so create a separate build directory
@@ -160,10 +160,10 @@ jobs:
 
       - name: Build
         shell: bash
-        # apparently checkout@v2 pulls to Auto-Vk/Auto-Vk on windows
+        # apparently checkout@v3 pulls to Auto-Vk/Auto-Vk on windows
         working-directory: ${{ runner.workspace }}/${{ github.event.repository.name }}/build
         # Execute the build.  You can specify a specific target with "--target <NAME>"
-        run: cmake --build . --config $BUILD_TYPE
+        run: VULKAN_SDK=${{ env.vulkan_sdk }} cmake --build . --config $BUILD_TYPE
 
   windows-latest:
     name: ${{ matrix.config.name }}, windows-latest, VulkanSDK ${{ matrix.vulkan-sdk }}, VMA=${{ matrix.vma }}
@@ -226,11 +226,6 @@ jobs:
           $env:Vulkan_LIBRARY="${{ env.vulkan_sdk }}/Bin"
           $env:Vulkan_INCLUDE_DIR="${{ env.vulkan_sdk }}/Include"
           $env:Path += ";${{ env.vulkan_sdk }}\;${{ env.vulkan_sdk }}\Bin\"
-          $env:VULKAN_SDK="${{ env.vulkan_sdk }}"
-          $env:Vulkan_LIBRARY="${{ env.vulkan_sdk }}/Bin"
-          $env:Vulkan_INCLUDE_DIR="${{ env.vulkan_sdk }}/Include"
-
-          # apparently checkout@v2 pulls to Auto-Vk/Auto-Vk on windows
           cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -Davk_LibraryType=STATIC ${{ runner.workspace }}/${{ github.event.repository.name }} -Davk_UseVMA=${{ matrix.vma }} -G "Visual Studio 17 2022" -A x64
 
       - name: Build