Merge cargo-gpu into rust-gpu

.cargo/config.toml

@@ -1,4 +1,6 @@
 [alias]
+xtask = "run --package xtask --"
+build-test-shader = "xtask test-build"
 compiletest = "run --release -p compiletests --"
 difftest = "run --release -p difftests --"
 run-wasm = ["run", "--release", "-p", "run-wasm", "--"]

.github/workflows/ci.yaml

@@ -24,7 +24,7 @@ jobs:
         os: [ ubuntu-latest, windows-latest, macOS-latest ]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Install Vulkan SDK
         uses: jakoch/install-vulkan-sdk-action@v1
         with:
@@ -55,7 +55,7 @@ jobs:
         run: cargo test -p rustc_codegen_spirv --release --no-default-features --features "use-installed-tools"
 
       - name: workspace test (excluding examples)
-        run: cargo test --release --workspace --exclude "example-runner-*" --no-default-features --features "use-installed-tools,clap"
+        run: cargo test --release --workspace --exclude "example-runner-*"  --exclude "cargo-gpu*" --no-default-features --features "use-installed-tools,clap"
 
       # Examples
       - name: cargo check examples
@@ -84,7 +84,7 @@ jobs:
         target: [ aarch64-linux-android ]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Install Vulkan SDK
         uses: jakoch/install-vulkan-sdk-action@v1
         with:
@@ -128,7 +128,7 @@ jobs:
         os: [ ubuntu-latest, windows-latest, macOS-latest ]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Install Vulkan SDK
         uses: jakoch/install-vulkan-sdk-action@v1
         with:
@@ -151,7 +151,7 @@ jobs:
         os: [ ubuntu-latest, windows-latest, macOS-latest ]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Install Vulkan SDK
         uses: jakoch/install-vulkan-sdk-action@v1
         with:
@@ -180,11 +180,115 @@ jobs:
       - name: difftests
         run: cargo run -p difftests --release --no-default-features --features "use-installed-tools"
 
+  cargo-gpu-os:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
+    runs-on: ${{ matrix.os }}
+    env:
+      RUST_LOG: debug
+    steps:
+      - uses: actions/checkout@v6
+      - uses: taiki-e/install-action@v2
+        with:
+          tool: nextest
+      - run: cargo fetch --locked
+      - name: shader-crate-template cargo fetch --locked
+        run: |
+          cd ./crates/shader-crate-template
+          cargo fetch --locked
+      - run: cargo nextest run -p cargo-gpu -p cargo-gpu-install
+      - name: Run a full build
+        run: cargo xtask test-build
+
+  cargo-gpu-backwards-compat:
+    # The dependency is technically unnecessary, this is just to delay the launch of this job, so that github prefers
+    # launching long-running jobs first. Currently, these jobs take only about 7min compared to 22min of others.
+    needs: [cargo-deny]
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          # As well as testing on each OS, we also want to test to make sure we're still supporting
+          # older versions of `rust-gpu`. However, we can assume that these tests are already okay
+          # across platforms, so we only need to test on Linux, the chepeast in terms of minutes.
+          #
+          # `0.7.0` currently fails building `spirv-builder-cli` with:
+          #    """
+          #    package `is_terminal_polyfill v1.70.1` cannot be built because it requires rustc
+          #    1.70.0 or newer, while the currently active rustc version is 1.69.0-nightly
+          #    """
+          # It's probably easily fixable. But also `0.7.0` was released in April 2023, so there's
+          # unlikely many users of it?
+
+          # 0.8.0 started failing as well due to `zmij v1.0.20` requiring rustc 1.71 or newer
+          #          - rust-gpu-version: 0.8.0
+          #            glam-version: 0.24.2
+          - rust-gpu-version: 0.9.0
+            glam-version: 0.24.2
+
+          # target spec introduction
+          # last version before
+          # * fails: compiler too old, `serde` using `#[diagnostic]`
+          #          - rust-gpu-version: cc752312c3de6813a41189e46476d5c1be5e0bbe
+          #            glam-version: 0.30.7
+          # first version requiring target specs
+          # * fails: target spec mismatch!
+          # * resolution: Since this is just a few commits, I'd be fine ignoring it.
+          #          - rust-gpu-version: 02cefd101014f66b79dffb20a2c2b5b7c9038401
+          #            glam-version: 0.30.7
+          # target specs change again just a few commits later
+          # * fails: compiler too old, `proc-macro2` using `Literal::byte_character`.
+          # * resolution: want to support, can't be bothered to hack in old proc-macro2 versions
+          #          - rust-gpu-version: bbb61f58b3d24f3f64745050eb214b90bf6dcce9
+          #            glam-version: 0.30.7
+
+          # testing rustc 1.5 months later
+          - rust-gpu-version: eea8998df9dc2fd8e7a65c5b5b7ae20c238a665a
+            glam-version: 0.29.3
+
+          # just after target specs v2 refactor, we updated to rustc 1.85 and needed to change them again
+          # before
+          - rust-gpu-version: a547c6e45266d613d9fec673e869d7a96181e47b
+            glam-version: =0.30.7
+          # after
+          - rust-gpu-version: 2326b87fe1542eeb898065e36ac949307b55386d
+            glam-version: =0.30.7
+
+          # glam semver breakage due to vector type refactor
+          # before, glam was fixed to <=0.30.7 in this commit
+          - rust-gpu-version: f79c4181a5dc2d37303947b113f190930c6c1ce6
+            glam-version: =0.30.7
+          # after, glam >0.30.8
+          - rust-gpu-version: e767f24f2565baf1a71bbaf84d453d181cab2417
+
+          # rustc 1.94.0 destabilised json target specs, requiring `-Ztarget-spec-json`
+          # see https://github.com/Rust-GPU/rust-gpu/pull/545
+          # see https://github.com/rust-lang/rust/pull/150151
+          # before
+          - rust-gpu-version: 30896871ba00e668029ccb724f1438202b284708
+          # after
+          - rust-gpu-version: 877bd8697a15f3e6d09446a5e1807e6237ca1dac
+    runs-on: ubuntu-latest
+    env:
+      RUST_LOG: debug
+    steps:
+      - uses: actions/checkout@v6
+      - if: ${{ matrix.glam-version }}
+        name: set glam version
+        run: cargo xtask set-dependency glam ${{ matrix.glam-version }}
+      - name: Run a full build
+        run: cargo xtask test-build --rust-gpu-version ${{ matrix.rust-gpu-version }}
+
   # This allows us to have a single job we can branch protect on, rather than needing
   # to update the branch protection rules when the test matrix changes
   test_success:
     runs-on: ubuntu-latest
-    needs: [test, compiletest, difftest, android, lint, cargo-deny]
+    needs: [test, compiletest, difftest, android, lint, cargo-deny, cargo-gpu-os, cargo-gpu-backwards-compat]
     # Hack for buggy GitHub Actions behavior with skipped checks: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/troubleshooting-required-status-checks#handling-skipped-but-required-checks
     if: ${{ always() }}
     steps:
@@ -197,6 +301,8 @@ jobs:
           [[ "${{ needs.android.result }}" == "success" ]] || exit 1
           [[ "${{ needs.lint.result }}" == "success" ]] || exit 1
           [[ "${{ needs.cargo-deny.result }}" == "success" ]] || exit 1
+          [[ "${{ needs.cargo-gpu-os.result }}" == "success" ]] || exit 1
+          [[ "${{ needs.cargo-gpu-backwards-compat.result }}" == "success" ]] || exit 1
 
   lint:
     name: Lint
@@ -205,7 +311,7 @@ jobs:
       # Note that we are explicitly NOT checking out submodules, to validate
       # that we haven't accidentally enabled spirv-tools native compilation
       # and regressed CI times
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: "false"
       - name: Install native dependencies
@@ -244,7 +350,7 @@ jobs:
   cargo-deny:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: EmbarkStudios/cargo-deny-action@v2
 
 defaults: