From 5e37b7f08309b34343540570e8eebc26330c3f23 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Wed, 25 Oct 2023 13:17:43 +0300 Subject: [PATCH] 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 --- .github/workflows/HTTP_Build.yml | 8 +++++++- .github/workflows/Hydra_Build.yml | 14 ++++++++++---- .github/workflows/Linux_Build.yml | 8 +++++++- .github/workflows/MacOS_Build.yml | 2 +- .github/workflows/Qt_Build.yml | 4 ++-- .github/workflows/Windows_Build.yml | 2 +- 6 files changed, 28 insertions(+), 10 deletions(-) diff --git a/.github/workflows/HTTP_Build.yml b/.github/workflows/HTTP_Build.yml index 24cd19bcd..f80d16dbe 100644 --- 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/setup-vulkan-sdk@v1.2.0 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 index 181940592..25c4f458f 100644 --- 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/setup-vulkan-sdk@v1.2.0 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 index bbc79d819..0dc42673c 100644 --- 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/setup-vulkan-sdk@v1.2.0 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 index 7e54c5a5f..b659e3fa9 100644 --- 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 index 0cb007f47..f824d0aaa 100644 --- 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 index 653692f3e..ae9fd5879 100644 --- 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.