From 2939514c307e358164f540e691eaa35928b3e864 Mon Sep 17 00:00:00 2001 From: Moritz Heinemann Date: Wed, 10 Jan 2024 16:35:04 +0100 Subject: [PATCH] Fix glslang binary name deprecation --- .ci/check_shaders.sh | 4 ++-- .github/workflows/shader_check.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/check_shaders.sh b/.ci/check_shaders.sh index 787561bab8..af1d66a9f7 100755 --- a/.ci/check_shaders.sh +++ b/.ci/check_shaders.sh @@ -60,10 +60,10 @@ for sdir in "${SHADER_DIRS[@]}"; do LOCAL_INCLUDE_PATHS=("-I$(pwd)/$(dirname "$sfile")") glslang_exit_code=0 - output="$(glslangValidator -l "${INCLUDE_PATHS[@]}" --p "#extension GL_GOOGLE_include_directive : require" "${LOCAL_INCLUDE_PATHS[@]}" $sfile)" || glslang_exit_code=$? + output="$(glslang -l "${INCLUDE_PATHS[@]}" --p "#extension GL_GOOGLE_include_directive : require" "${LOCAL_INCLUDE_PATHS[@]}" $sfile)" || glslang_exit_code=$? if [[ $glslang_exit_code -ne 0 ]]; then echo "" - echo "::error::########## glslangValidator found issues in $sfile ##########" + echo "::error::########## glslang found issues in $sfile ##########" echo "$output" EXIT_CODE=1 fi diff --git a/.github/workflows/shader_check.yml b/.github/workflows/shader_check.yml index 14916e46be..827c5946ea 100644 --- a/.github/workflows/shader_check.yml +++ b/.github/workflows/shader_check.yml @@ -16,7 +16,7 @@ jobs: run: | mkdir bin wget "https://github.com/KhronosGroup/glslang/releases/download/main-tot/glslang-main-linux-Release.zip" - unzip -j "glslang-main-linux-Release.zip" "bin/glslangValidator" -d ./bin + unzip -j "glslang-main-linux-Release.zip" "bin/glslang" -d ./bin rm "glslang-main-linux-Release.zip" echo "./bin" >> $GITHUB_PATH - name: Run shader check