diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bda51af..1e06a4a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,20 +12,20 @@ permissions: env: CARGO_TERM_COLOR: always TMPDIR: /dev/shm + # The MSRV, as in `mise.toml`, `rust-version` and `release.yml`. Every Rust job uses it, so a new + # stable's lints cannot block merges until the toolchain bump PR. + RUST_TOOLCHAIN: "1.98" jobs: test: runs-on: ubuntu-latest - strategy: - matrix: - rust: [stable, "1.98"] steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: persist-credentials: false - uses: actions-rust-lang/setup-rust-toolchain@150fca883cd4034361b621bd4e6a9d34e5143606 # v1.15.4 with: - toolchain: ${{ matrix.rust }} + toolchain: ${{ env.RUST_TOOLCHAIN }} - run: cargo test --workspace clippy: @@ -36,7 +36,7 @@ jobs: persist-credentials: false - uses: actions-rust-lang/setup-rust-toolchain@150fca883cd4034361b621bd4e6a9d34e5143606 # v1.15.4 with: - toolchain: stable + toolchain: ${{ env.RUST_TOOLCHAIN }} components: clippy - run: cargo clippy --workspace -- -D warnings @@ -48,7 +48,7 @@ jobs: persist-credentials: false - uses: actions-rust-lang/setup-rust-toolchain@150fca883cd4034361b621bd4e6a9d34e5143606 # v1.15.4 with: - toolchain: stable + toolchain: ${{ env.RUST_TOOLCHAIN }} components: rustfmt - run: cargo fmt --all --check @@ -107,7 +107,7 @@ jobs: persist-credentials: false - uses: actions-rust-lang/setup-rust-toolchain@150fca883cd4034361b621bd4e6a9d34e5143606 # v1.15.4 with: - toolchain: stable + toolchain: ${{ env.RUST_TOOLCHAIN }} target: wasm32-wasip2 - working-directory: crates/zed-extension run: cargo build --release --target wasm32-wasip2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 66eb415..6387dbf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,6 +16,8 @@ concurrency: env: CARGO_TERM_COLOR: always + # The toolchain `ci.yml` tests with, so the released binaries come from the compiler CI checked. + RUST_TOOLCHAIN: "1.98" jobs: verify: @@ -114,7 +116,7 @@ jobs: - uses: actions-rust-lang/setup-rust-toolchain@150fca883cd4034361b621bd4e6a9d34e5143606 # v1.15.4 with: - toolchain: stable + toolchain: ${{ env.RUST_TOOLCHAIN }} target: ${{ matrix.target }} cache: false