chore: trying to make other jobs work again

.github/workflows/ci.yml

@@ -32,7 +32,7 @@ jobs:
  # NOTE vmx 2024-07-15: Use at least Rust 1.68.2 for now, so that we can use the sparse
  # index. Without this, the build times out. Once the MSRV is >= 1.68.2, we don't need
  # to special case anymore and can use the MSRV instead.
- rust: 1.68.2
+ toolchain: 1.68.2
  arch: aarch64
 
  runs-on: ubuntu-22.04
@@ -55,12 +55,12 @@ jobs:
  install: |
  apt-get update -q -y
  apt-get install -q -y ocl-icd-opencl-dev curl build-essential
- curl https://sh.rustup.rs -sSf | sh -s -- --profile minimal --default-toolchain ${{ matrix.rust }} -y
+ curl https://sh.rustup.rs -sSf | sh -s -- --profile minimal --default-toolchain ${{ matrix.toolchain }} -y
  source $HOME/.cargo/env
 
  run: |
  echo "vmx: one"
- $HOME/.cargo/bin/rustup override set ${{ matrix.rust }}
+ $HOME/.cargo/bin/rustup override set ${{ matrix.toolchain }}
  echo "vmx: two"
  $HOME/.cargo/bin/cargo test --release --target ${{ matrix.target }}
  echo "vmx: three"
@@ -75,24 +75,24 @@ jobs:
  include:
  # 32-bit Linux/x86
  - target: i686-unknown-linux-gnu
- rust: ${{needs.set-msrv.outputs.msrv}}
+ toolchain: ${{needs.set-msrv.outputs.msrv}}
  deps: sudo apt update && sudo apt install gcc-multilib
  - target: i686-unknown-linux-gnu
- rust: stable
+ toolchain: stable
  deps: sudo apt update && sudo apt install gcc-multilib
 
  # 64-bit Linux/x86_64
  - target: x86_64-unknown-linux-gnu
- rust: ${{needs.set-msrv.outputs.msrv}}
+ toolchain: ${{needs.set-msrv.outputs.msrv}}
  - target: x86_64-unknown-linux-gnu
- rust: stable
+ toolchain: stable
 
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@v4
  - uses: dtolnay/rust-toolchain@master
  with:
- toolchain: ${{ matrix.rust }}
+ toolchain: ${{ matrix.toolchain }}
  target: ${{ matrix.target }}
  - name: Install opencl
  run: sudo apt-get install -y ocl-icd-opencl-dev
@@ -114,7 +114,7 @@ jobs:
  - uses: actions/checkout@v4
  - uses: dtolnay/rust-toolchain@master
  with:
- toolchain: ${{ matrix.rust }}
+ toolchain: ${{ matrix.toolchain }}
  target: x86_64-apple-darwin
  - run: cargo test
  - run: cargo test --features portable
@@ -134,7 +134,7 @@ jobs:
  - uses: actions/checkout@v4
  - uses: dtolnay/rust-toolchain@master
  with:
- toolchain: ${{ matrix.rust }}
+ toolchain: ${{ matrix.toolchain }}
  target: ${{ matrix.target }}
  - uses: msys2/setup-msys2@v2
  - run: cargo test --target ${{ matrix.target }}
@@ -146,7 +146,7 @@ jobs:
  - uses: actions/checkout@v4
  - uses: dtolnay/rust-toolchain@master
  with:
- toolchain: ${{ matrix.rust }}
+ toolchain: ${{ needs.set-msrv.outputs.msrv }}
  components: clippy
  - name: Clippy
  run: cargo clippy --all-features
@@ -159,7 +159,7 @@ jobs:
 
  - uses: dtolnay/rust-toolchain@master
  with:
- toolchain: ${{ matrix.rust }}
+ toolchain: ${{ needs.set-msrv.outputs.msrv }}
  components: rustfmt
 
  - name: setup