Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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
4 changes: 3 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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

Expand Down
Loading