diff options
| author | Theresa Foley <10618364+tangent-vector@users.noreply.github.com> | 2023-02-28 15:10:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-28 15:10:14 -0800 |
| commit | 7eeda30df967671c410de4fd725f91f9078d74c4 (patch) | |
| tree | 4a6c233f5e714b8b1f7899f89c6e696bc767d395 /.github/workflows | |
| parent | f7db44a236bb867003395d1a91d6907901653528 (diff) | |
Fixes to GitHub Windows CI build (#2664)
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/windows.yml | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 023387ced..3d8fe3ea8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -15,11 +15,26 @@ jobs: matrix: configuration: ['Debug', 'Release'] platform: ['Win32', 'x64'] + include: + - platform: Win32 + testPlatform: x86 + - platform: x64 + testPlatform: x64 + - testCategory: quick + - platform: x64 + testCategory: full + - configuration: Debug + testCategory: smoke steps: - uses: actions/checkout@v3 with: submodules: 'true' fetch-depth: '0' + - uses: robinraju/release-downloader@v1.7 + with: + latest: true + repository: "shader-slang/swiftshader" + fileName: "vk_swiftshader_windows_${{matrix.testPlatform}}.zip" - name: setup-msbuild uses: microsoft/setup-msbuild@v1 - name: build @@ -47,24 +62,8 @@ jobs: docs/*.md - name: test run: | - if ("${{matrix.configuration}}" -eq "Debug") { - $testCategory = "smoke"; - } - elseif("${{matrix.platform}}" -eq "x64") { - $testCategory = "full"; - } - else { - $testCategory = "quick"; - } - if ("${{matrix.platform}}" -eq "Win32") { - $testPlatform = "x86"; - } - else { - $testPlatform = "x64"; - } - $slangTestBinDir = ".\bin\windows-$testPlatform\${{matrix.configuration}}\"; + $slangTestBinDir = ".\bin\windows-${{matrix.testPlatform}}\${{matrix.configuration}}\"; $env:Path += ";$slangTestBinDir"; - Invoke-WebRequest -uri "https://github.com/shader-slang/swiftshader/releases/download/v1.0/vk_swiftshader_windows_$testPlatform.zip" -Method "GET" -Outfile "swiftshader.zip"; - Expand-Archive "swiftshader.zip" -DestinationPath $slangTestBinDir; - & "$slangTestBinDir\slang-test.exe" -api all-dx12 -appveyor -bindir "$slangTestBinDir\" -platform $testPlatform -configuration ${{matrix.configuration}} -category $testCategory 2>&1; + 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 |