ci testing on windows / vulkan

.github/workflows/ci.yaml

@@ -63,60 +63,29 @@ jobs:
   krnlc:
     runs-on: ${{ matrix.os }}
     timeout-minutes: 20
-    env:
-      # spirv tools install copied from https://github.com/EmbarkStudios/rust-gpu/blob/main/.github/workflows/ci.yaml
-      spirv_tools_version: "20221024"
-      # NOTE(eddyb) do not forget to update both the above date and below links!
-      # FIXME(eddyb) automate this somewhat by taking advantage of the bucket APIs,
-      # and look for the first build with the date in `spirv_tools_version`.
-      spirv_tools_linux_url: "https://storage.googleapis.com/spirv-tools/artifacts/prod/graphics_shader_compiler/spirv-tools/linux-clang-release/continuous/1863/20221024-094528/install.tgz"
-      spirv_tools_macos_url: "https://storage.googleapis.com/spirv-tools/artifacts/prod/graphics_shader_compiler/spirv-tools/macos-clang-release/continuous/1875/20221024-094531/install.tgz"
-      spirv_tools_windows_url: "https://storage.googleapis.com/spirv-tools/artifacts/prod/graphics_shader_compiler/spirv-tools/windows-msvc-2017-release/continuous/1851/20221024-094908/install.zip"
     strategy:
       fail-fast: false
       matrix:
         include:
           - os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
-          # - os: windows-latest
-          #   target: x86_64-pc-windows-msvc
+          - os: windows-latest
+            target: x86_64-pc-windows-msvc
           - os: macos-latest
             target: x86_64-apple-darwin
-    # spirv tools install copied from https://github.com/EmbarkStudios/rust-gpu/blob/main/.github/workflows/ci.yaml
     steps:
       - uses: actions/checkout@v4
       - name: install toolchains
         run: |
           rustup set profile minimal
           rustup toolchain install stable nightly --no-self-update
           rustup toolchain install nightly-2023-05-27 --component rust-src,rustc-dev,llvm-tools-preview --no-self-update
-      - if: ${{ runner.os == 'Linux' }}
-        name: Linux - Install native dependencies and spirv-tools
-        run: |
-          sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev
-          mkdir "${HOME}/spirv-tools"
-          curl -fL "$spirv_tools_linux_url" | tar -xz -C "${HOME}/spirv-tools"
-          echo "${HOME}/spirv-tools/install/bin" >> $GITHUB_PATH
-      - if: ${{ runner.os == 'macOS' }}
-        name: Mac - Install spirv-tools
-        # FIXME(eddyb) deduplicate with Linux (and maybe even Windows?).
-        run: |
-          mkdir "${HOME}/spirv-tools"
-          curl -fL "$spirv_tools_macos_url" | tar -xz -C "${HOME}/spirv-tools"
-          echo "${HOME}/spirv-tools/install/bin" >> $GITHUB_PATH
-      - if: ${{ runner.os == 'Windows' }}
-        name: Windows - Install spirv-tools
-        shell: bash
-        run: |
-          tmparch=$(mktemp)
-          mkdir "${HOME}/spirv-tools"
-          curl -fL -o "$tmparch" "$spirv_tools_windows_url"
-          unzip "$tmparch" -d "${HOME}/spirv-tools"
-      - if: ${{ runner.os == 'Windows' }}
-        # Runs separately to add spir-v tools to Powershell's Path.
-        run: echo "$HOME/spirv-tools/install/bin" >> $env:GITHUB_PATH
-      # end install spirv-tools
-      - uses: actions/checkout@v4
+      - name: install vulkan sdk
+        uses: jakoch/install-vulkan-sdk-action@v1
+        with:
+          vulkan_version: 1.3.224
+          cache: true
+          stripdown: true
       - name: check krnlc
         run: cargo +nightly-2023-05-27 -Zunstable-options -C=krnlc check --locked --no-default-features --features use-installed-tools -vv
       - name: install krnlc