Skip to content

Commit e882219

Browse files
committed
Fix CI?
1 parent 2829168 commit e882219

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

.github/workflows/rust.yml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ jobs:
4848
sudo /Volumes/VulkanSDK/InstallVulkan.app/Contents/MacOS/InstallVulkan --root $GITHUB_WORKSPACE/vulkansdk-macos-$VULKAN_SDK_VERSION --accept-licenses --default-answer --confirm-command install
4949
hdiutil detach /Volumes/VulkanSDK
5050
echo "VULKAN_SDK_PATH=$GITHUB_WORKSPACE/vulkansdk-macos-$VULKAN_SDK_VERSION" >> $GITHUB_ENV
51-
echo "VULKAN_SDK=$VULKAN_SDK_PATH/macOS" >> $GITHUB_ENV
52-
echo "DYLD_LIBRARY_PATH=$VULKAN_SDK/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
53-
echo "PATH=$VULKAN_SDK/bin:$PATH" >> $GITHUB_ENV
51+
echo "VULKAN_SDK=$GITHUB_WORKSPACE/vulkansdk-macos-$VULKAN_SDK_VERSION/macOS" >> $GITHUB_ENV
52+
echo "DYLD_LIBRARY_PATH=$GITHUB_WORKSPACE/vulkansdk-macos-$VULKAN_SDK_VERSION/macOS/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
53+
echo "PATH=$GITHUB_WORKSPACE/vulkansdk-macos-$VULKAN_SDK_VERSION/macOS/bin:$PATH" >> $GITHUB_ENV
5454
elif [ "$RUNNER_OS" == "Windows" ]; then
55-
wget "https://sdk.lunarg.com/sdk/download/$VULKAN_SDK_VERSION/windows/VulkanSDK-$VULKAN_SDK_VERSION-Installer.exe?Human=true" -O vulkan-sdk.exe
55+
curl -L "https://sdk.lunarg.com/sdk/download/$VULKAN_SDK_VERSION/windows/VulkanSDK-$VULKAN_SDK_VERSION-Installer.exe?Human=true" -o vulkan-sdk.exe
5656
./vulkan-sdk.exe --accept-licenses --default-answer --confirm-command install
5757
echo "VULKAN_SDK=C:\\VulkanSDK\\$VULKAN_SDK_VERSION" >> $GITHUB_ENV
5858
echo "PATH=$VULKAN_SDK\\Bin;$PATH" >> $GITHUB_ENV
@@ -69,7 +69,7 @@ jobs:
6969
- if: ${{ matrix.use_moltenvk == true }}
7070
name: Setup MoltenVK on macOS
7171
run: |
72-
echo "VK_ICD_FILENAMES=$VULKAN_SDK/share/vulkan/icd.d/MoltenVK_icd.json" >> $GITHUB_ENV
72+
echo "VK_ICD_FILENAMES=$GITHUB_WORKSPACE/vulkansdk-macos-1.3.250.1/macOS/share/vulkan/icd.d/MoltenVK_icd.json" >> $GITHUB_ENV
7373
7474
- name: Install SwiftShader
7575
if: ${{ matrix.use_swiftshader == true || runner.os == 'Linux' || runner.os == 'Windows' }}
@@ -98,8 +98,8 @@ jobs:
9898
sed -i '' "s/..\/..\/..\/lib\/libvk_swiftshader.dylib/.\/libvk_swiftshader.dylib/" "$SWIFTSHADER_DEST_DIR/vk_swiftshader_icd.json"
9999
echo "VK_ICD_FILENAMES=$SWIFTSHADER_DEST_DIR/vk_swiftshader_icd.json" >> $GITHUB_ENV
100100
elif [ "$RUNNER_OS" == "Windows" ]; then
101-
choco install --yes 7zip wget
102-
wget -O swiftshader.zip ${{env.SWIFTSHADER_WINDOWS_URL}}
101+
choco install --yes 7zip
102+
curl -L ${{env.SWIFTSHADER_WINDOWS_URL}} -o swiftshader.zip
103103
7z x swiftshader.zip -otemp-ss-dl/
104104
rm swiftshader.zip
105105
mv temp-ss-dl/swiftshader-*/swiftshader-*.7z temp-ss-dl/swiftshader.7z
@@ -118,7 +118,11 @@ jobs:
118118
components: rust-src, rustc-dev, llvm-tools
119119

120120
- name: Install cargo-gpu
121-
run: cargo install --git https://github.com/rust-gpu/cargo-gpu cargo-gpu
121+
run: |
122+
# Set non-interactive mode to avoid raw mode issues in CI
123+
export CARGO_TERM_COLOR=never
124+
export CI=true
125+
cargo install --git https://github.com/rust-gpu/cargo-gpu cargo-gpu
122126
123127
- name: Cache cargo registry
124128
uses: actions/cache@v3
@@ -130,7 +134,11 @@ jobs:
130134

131135
- name: Compile shaders to SPIR-V
132136
working-directory: shaders/rust
133-
run: python3 compileshaders.py
137+
run: |
138+
# Set non-interactive mode for cargo-gpu
139+
export CARGO_TERM_COLOR=never
140+
export CI=true
141+
python3 compileshaders.py
134142
135143
- name: Verify no uncommitted changes
136144
run: |

0 commit comments

Comments
 (0)