Skip to content

Commit 177e464

Browse files
committed
chore: trying to make other jobs work again
1 parent 4e2929a commit 177e464

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
# NOTE vmx 2024-07-15: Use at least Rust 1.68.2 for now, so that we can use the sparse
3333
# index. Without this, the build times out. Once the MSRV is >= 1.68.2, we don't need
3434
# to special case anymore and can use the MSRV instead.
35-
rust: 1.68.2
35+
toolchain: 1.68.2
3636
arch: aarch64
3737

3838
runs-on: ubuntu-22.04
@@ -55,12 +55,12 @@ jobs:
5555
install: |
5656
apt-get update -q -y
5757
apt-get install -q -y ocl-icd-opencl-dev curl build-essential
58-
curl https://sh.rustup.rs -sSf | sh -s -- --profile minimal --default-toolchain ${{ matrix.rust }} -y
58+
curl https://sh.rustup.rs -sSf | sh -s -- --profile minimal --default-toolchain ${{ matrix.toolchain }} -y
5959
source $HOME/.cargo/env
6060
6161
run: |
6262
echo "vmx: one"
63-
$HOME/.cargo/bin/rustup override set ${{ matrix.rust }}
63+
$HOME/.cargo/bin/rustup override set ${{ matrix.toolchain }}
6464
echo "vmx: two"
6565
$HOME/.cargo/bin/cargo test --release --target ${{ matrix.target }}
6666
echo "vmx: three"
@@ -75,24 +75,24 @@ jobs:
7575
include:
7676
# 32-bit Linux/x86
7777
- target: i686-unknown-linux-gnu
78-
rust: ${{needs.set-msrv.outputs.msrv}}
78+
toolchain: ${{needs.set-msrv.outputs.msrv}}
7979
deps: sudo apt update && sudo apt install gcc-multilib
8080
- target: i686-unknown-linux-gnu
81-
rust: stable
81+
toolchain: stable
8282
deps: sudo apt update && sudo apt install gcc-multilib
8383

8484
# 64-bit Linux/x86_64
8585
- target: x86_64-unknown-linux-gnu
86-
rust: ${{needs.set-msrv.outputs.msrv}}
86+
toolchain: ${{needs.set-msrv.outputs.msrv}}
8787
- target: x86_64-unknown-linux-gnu
88-
rust: stable
88+
toolchain: stable
8989

9090
runs-on: ubuntu-latest
9191
steps:
9292
- uses: actions/checkout@v4
9393
- uses: dtolnay/rust-toolchain@master
9494
with:
95-
toolchain: ${{ matrix.rust }}
95+
toolchain: ${{ matrix.toolchain }}
9696
target: ${{ matrix.target }}
9797
- name: Install opencl
9898
run: sudo apt-get install -y ocl-icd-opencl-dev
@@ -114,7 +114,7 @@ jobs:
114114
- uses: actions/checkout@v4
115115
- uses: dtolnay/rust-toolchain@master
116116
with:
117-
toolchain: ${{ matrix.rust }}
117+
toolchain: ${{ matrix.toolchain }}
118118
target: x86_64-apple-darwin
119119
- run: cargo test
120120
- run: cargo test --features portable
@@ -134,7 +134,7 @@ jobs:
134134
- uses: actions/checkout@v4
135135
- uses: dtolnay/rust-toolchain@master
136136
with:
137-
toolchain: ${{ matrix.rust }}
137+
toolchain: ${{ matrix.toolchain }}
138138
target: ${{ matrix.target }}
139139
- uses: msys2/setup-msys2@v2
140140
- run: cargo test --target ${{ matrix.target }}
@@ -146,7 +146,7 @@ jobs:
146146
- uses: actions/checkout@v4
147147
- uses: dtolnay/rust-toolchain@master
148148
with:
149-
toolchain: ${{ matrix.rust }}
149+
toolchain: ${{ needs.set-msrv.outputs.msrv }}
150150
components: clippy
151151
- name: Clippy
152152
run: cargo clippy --all-features
@@ -159,7 +159,7 @@ jobs:
159159

160160
- uses: dtolnay/rust-toolchain@master
161161
with:
162-
toolchain: ${{ matrix.rust }}
162+
toolchain: ${{ needs.set-msrv.outputs.msrv }}
163163
components: rustfmt
164164

165165
- name: setup

0 commit comments

Comments
 (0)