Use package manager glslc when available.

stripe2933 · Feb 6, 2025 · b04164a · b04164a
1 parent 09612c3
commit b04164a
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,20 +23,29 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install Vulkan SDK
+      - name: Install Vulkan SDK (with glslang)
+        if: ${{ matrix.os == 'windows-latest' }}
         uses: humbletim/[email protected]
         with:
           vulkan-query-version: 1.3.296.0
           vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang, SPIRV-Tools
           vulkan-use-cache: true
 
+      - name: Install Vulkan SDK (without glslang)
+        if: ${{ matrix.os != 'windows-latest' }}
+        uses: humbletim/[email protected]
+        with:
+          vulkan-query-version: 1.3.296.0
+          vulkan-components: Vulkan-Headers, Vulkan-Loader
+          vulkan-use-cache: true
+
       - name: Install build dependencies (macOS)
         if: ${{ matrix.os == 'macos-latest' }}
-        run: brew install llvm ninja autoconf automake libtool nasm
+        run: brew install llvm ninja shaderc autoconf automake libtool nasm
 
       - name: Install build dependencies (ubuntu-24.04)
         if: ${{ matrix.os == 'ubuntu-24.04' }}
-        run: sudo apt-get install ninja-build libc++-dev libc++abi-dev xorg-dev libtool libltdl-dev
+        run: sudo apt-get install ninja-build libc++-dev libc++abi-dev glslc xorg-dev libtool libltdl-dev
 
       - name: Setup vcpkg (macOS)
         if: ${{ matrix.os == 'macos-latest' }}