Skip to content

Commit

Permalink
ci: restrict shaderc version to fix build errors
Browse files Browse the repository at this point in the history
KhronosGroup/glslang#3787 was fixed already
but shaderc uses pinned revisions, so let's just downgrade.
  • Loading branch information
sfan5 committed Nov 7, 2024
1 parent 46fe3cd commit 6d23c5f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions ci/build-mingw64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ _ffmpeg_mark=lib/libavcodec.dll.a
_shaderc () {
if [ ! -d shaderc ]; then
$gitclone https://github.com/google/shaderc.git
(cd shaderc && git fetch --tags && git checkout v2024.3)
(cd shaderc && ./utils/git-sync-deps)
fi
builddir shaderc
Expand Down
1 change: 1 addition & 0 deletions ci/build-win32.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ if (-not (Test-Path $subprojects)) {
# Wrap shaderc to run git-sync-deps and patch unsupported generator expression
if (-not (Test-Path "$subprojects/shaderc_cmake")) {
git clone https://github.com/google/shaderc --depth 1 $subprojects/shaderc_cmake
git -C $subprojects/shaderc_cmake checkout v2024.3
Set-Content -Path "$subprojects/shaderc_cmake/p.diff" -Value @'
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index d44f62a..54d4719 100644
Expand Down

0 comments on commit 6d23c5f

Please sign in to comment.