diff options
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/linux-arm64.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/linux.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/windows-selfhosted.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/windows.yml | 5 |
4 files changed, 7 insertions, 4 deletions
diff --git a/.github/workflows/linux-arm64.yml b/.github/workflows/linux-arm64.yml index 8a2f958a2..bc1991444 100644 --- a/.github/workflows/linux-arm64.yml +++ b/.github/workflows/linux-arm64.yml @@ -53,4 +53,5 @@ jobs: CONFIGURATION=${{matrix.configuration}} CC=${{matrix.compiler}} ARCH=${{matrix.platform}} + PATH="${PATH:+${PATH}:}$(pwd)/external/slang-binaries/spirv-tools/$(uname -m)-linux/bin" source ./github_test.sh diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index fa4e4f446..435346837 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -69,4 +69,5 @@ jobs: CONFIGURATION=${{matrix.configuration}} CC=${{matrix.compiler}} ARCH=${{matrix.platform}} + PATH="${PATH:+${PATH}:}$(pwd)/external/slang-binaries/spirv-tools/$(uname -m)-linux/bin" source ./github_test.sh diff --git a/.github/workflows/windows-selfhosted.yml b/.github/workflows/windows-selfhosted.yml index 62370feb4..414f7515c 100644 --- a/.github/workflows/windows-selfhosted.yml +++ b/.github/workflows/windows-selfhosted.yml @@ -39,6 +39,6 @@ jobs: - name: test run: | $slangTestBinDir = ".\bin\windows-${{matrix.testPlatform}}\${{matrix.configuration}}\"; - $env:Path += ";$slangTestBinDir"; + $spirvToolsBinDir = ".\external\slang-binaries\spirv-tools\windows-${{matrix.testPlatform}}\bin\"; + $env:Path += ";$slangTestBinDir;$spirvToolsBinDir"; & "$slangTestBinDir\slang-test.exe" -appveyor -bindir "$slangTestBinDir\" -platform ${{matrix.testPlatform}} -configuration ${{matrix.configuration}} -category ${{matrix.testCategory}} -api all-cpu 2>&1; -
\ No newline at end of file diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3d8fe3ea8..f3ac5fc04 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -63,7 +63,8 @@ jobs: - name: test run: | $slangTestBinDir = ".\bin\windows-${{matrix.testPlatform}}\${{matrix.configuration}}\"; - $env:Path += ";$slangTestBinDir"; + $spirvToolsBinDir = ".\external\slang-binaries\spirv-tools\windows-${{matrix.testPlatform}}\bin\"; + $env:Path += ";$slangTestBinDir;$spirvToolsBinDir"; Expand-Archive "vk_swiftshader_windows_${{matrix.testPlatform}}.zip" -DestinationPath $slangTestBinDir; & "$slangTestBinDir\slang-test.exe" -api all-dx12 -appveyor -bindir "$slangTestBinDir\" -platform ${{matrix.testPlatform}} -configuration ${{matrix.configuration}} -category ${{matrix.testCategory}} 2>&1; -
\ No newline at end of file + |
