Skip to content

Commit 98e0902

Browse files
ssheoreyCopilot
andcommitted
Remove arm64 conditionals in macOS CI, since no other platforms are supported now.
Install glslang in all 3 platforms. Co-authored-by: Copilot <copilot@github.com>
1 parent 1b90638 commit 98e0902

3 files changed

Lines changed: 15 additions & 11 deletions

File tree

.github/workflows/macos.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,10 @@ jobs:
6363

6464
- name: Install dependencies
6565
run: |
66-
brew install ccache pkg-config libusb
67-
68-
if [[ ${{ runner.arch }} == "ARM64" ]]; then
69-
# Fix gfortran not found issue
70-
brew install gcc
71-
ln -s $(brew --prefix gcc)/bin/gfortran-* /usr/local/bin/gfortran
72-
fi
66+
brew install ccache pkg-config libusb glslang
67+
# Fix gfortran not found issue
68+
brew install gcc
69+
ln -s $(brew --prefix gcc)/bin/gfortran-* /usr/local/bin/gfortran
7370
7471
ccache -M 2G # See .github/workflows/readme.md for ccache strategy.
7572
- name: Config and build
@@ -188,11 +185,9 @@ jobs:
188185
install_python_dependencies
189186
190187
# Fix macos-14 arm64 runner image issues, see comments in MacOS job.
191-
if [[ ${{ runner.arch}} == "ARM64" ]]; then
192-
ln -s $(which gfortran-13) /usr/local/bin/gfortran
193-
fi
188+
ln -s $(which gfortran-13) /usr/local/bin/gfortran
194189
195-
brew install ccache
190+
brew install glslang ccache
196191
ccache -M 2G # See .github/workflows/readme.md for ccache strategy.
197192
198193
- name: Config and build wheel

.github/workflows/windows.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,13 @@ jobs:
9292
echo "CUDA_PATH_V$CUDA_VER_ID=$CUDA_PATH" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
9393
echo "$CUDA_PATH\bin" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf8 -Append
9494
95+
- name: Install glslang via vcpkg
96+
run: |
97+
vcpkg install glslang:x64-windows
98+
# Write install path to GITHUB_PATH to persist for future steps
99+
$glslangBinPath = Join-Path $env:VCPKG_INSTALLATION_ROOT "installed\x64-windows\bin"
100+
$glslangBinPath | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
101+
95102
- name: Checkout source code
96103
uses: actions/checkout@v4
97104

util/install_deps_ubuntu.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ deps=(
2727
libc++abi-dev
2828
libsdl2-dev
2929
libxi-dev
30+
# Compute shaders
31+
glslang-tools
3032
# ML
3133
libtbb-dev
3234
# Headless rendering

0 commit comments

Comments
 (0)