Test Vulkan CI fix (#329)

* Hopefully find a fix to the Vulkan CI issue * Update HTTP_Build.yml * Update Hydra_Build.yml * Update Linux_Build.yml * Update MacOS_Build.yml * Update Qt_Build.yml * Update HTTP_Build.yml * Update Hydra_Build.yml * Update HTTP_Build.yml * Update Hydra_Build.yml * Update Linux_Build.yml
wheremyfoodat · Oct 25, 2023 · 5e37b7f · 5e37b7f
1 parent 1313f46
commit 5e37b7f
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 10 deletions.
diff --git a/.github/workflows/HTTP_Build.yml b/.github/workflows/HTTP_Build.yml
@@ -22,13 +22,19 @@ jobs:
     - uses: actions/checkout@v2
     - name: Fetch submodules
       run: git submodule update --init --recursive
+
+    - name: Install newer Clang
+      run: |
+       wget https://apt.llvm.org/llvm.sh
+       chmod +x ./llvm.sh
+       sudo ./llvm.sh 16
 
     - name: Setup Vulkan SDK
       uses: humbletim/[email protected]
       with:
         vulkan-query-version: latest
         vulkan-use-cache: true
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.

diff --git a/.github/workflows/Hydra_Build.yml b/.github/workflows/Hydra_Build.yml
@@ -24,7 +24,7 @@ jobs:
       with:
         vulkan-query-version: latest
         vulkan-use-cache: true
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_USER_BUILD=ON -DBUILD_HYDRA_CORE=ON
@@ -52,7 +52,7 @@ jobs:
       with:
         vulkan-query-version: latest
         vulkan-use-cache: true
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_USER_BUILD=ON -DBUILD_HYDRA_CORE=ON
@@ -77,13 +77,19 @@ jobs:
     - name: Install misc packages
       run: |
        sudo apt-get update && sudo apt install libx11-dev libgl1-mesa-glx mesa-common-dev libfuse2 libwayland-dev
+      
+    - name: Install newer Clang
+      run: |
+       wget https://apt.llvm.org/llvm.sh
+       chmod +x ./llvm.sh
+       sudo ./llvm.sh 16
        
     - name: Setup Vulkan SDK
       uses: humbletim/[email protected]
       with:
         vulkan-query-version: latest
         vulkan-use-cache: true
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DENABLE_USER_BUILD=ON -DBUILD_HYDRA_CORE=ON
@@ -114,7 +120,7 @@ jobs:
       with:
         vulkan-query-version: latest
         vulkan-use-cache: true
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake -DANDROID_ABI=x86_64 -DBUILD_HYDRA_CORE=1 -DENABLE_VULKAN=0

diff --git a/.github/workflows/Linux_Build.yml b/.github/workflows/Linux_Build.yml
@@ -26,12 +26,18 @@ jobs:
     - name: Install misc packages
       run: sudo apt-get update && sudo apt install libx11-dev libgl1-mesa-glx mesa-common-dev
 
+    - name: Install newer Clang
+      run: |
+       wget https://apt.llvm.org/llvm.sh
+       chmod +x ./llvm.sh
+       sudo ./llvm.sh 16
+
     - name: Setup Vulkan SDK
       uses: humbletim/[email protected]
       with:
         vulkan-query-version: latest
         vulkan-use-cache: true
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.

diff --git a/.github/workflows/MacOS_Build.yml b/.github/workflows/MacOS_Build.yml
@@ -28,7 +28,7 @@ jobs:
       with:
         vulkan-query-version: latest
         vulkan-use-cache: true
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.

diff --git a/.github/workflows/Qt_Build.yml b/.github/workflows/Qt_Build.yml
@@ -30,7 +30,7 @@ jobs:
       with:
         vulkan-query-version: latest
         vulkan-use-cache: true
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DENABLE_USER_BUILD=ON -DENABLE_QT_GUI=ON
@@ -63,7 +63,7 @@ jobs:
       with:
         vulkan-query-version: latest
         vulkan-use-cache: true
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Install bundle dependencies
       run: |

diff --git a/.github/workflows/Windows_Build.yml b/.github/workflows/Windows_Build.yml
@@ -28,7 +28,7 @@ jobs:
       with:
         vulkan-query-version: latest
         vulkan-use-cache: true
-        vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang
+        vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Tools, Glslang
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.