Back out 89d57ffb: "build: add rust-toolchain.toml"
Some checks are pending
binaries / Build binary artifacts (push) Waiting to run
nix / flake check (push) Waiting to run
build / build (, macos-13) (push) Waiting to run
build / build (, macos-14) (push) Waiting to run
build / build (, ubuntu-latest) (push) Waiting to run
build / build (, windows-latest) (push) Waiting to run
build / build (--all-features, ubuntu-latest) (push) Waiting to run
build / Build jj-lib without Git support (push) Waiting to run
build / Check protos (push) Waiting to run
build / Check formatting (push) Waiting to run
build / Check that MkDocs can build the docs (push) Waiting to run
build / Check that MkDocs can build the docs with latest Python and uv (push) Waiting to run
build / cargo-deny (advisories) (push) Waiting to run
build / cargo-deny (bans licenses sources) (push) Waiting to run
build / Clippy check (push) Waiting to run
Codespell / Codespell (push) Waiting to run
website / prerelease-docs-build-deploy (ubuntu-latest) (push) Waiting to run
Scorecards supply-chain security / Scorecards analysis (push) Waiting to run

This backs out commit 89d57ffb29.

This is causing a CI failure because we can't build musl binaries,
presumably because the rust-toolchain file overriding the chosen
musl toolchain for some reason. Backout until we can reapply
a proper fix.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2024-12-12 14:15:48 -06:00
parent 97b14f9874
commit e7e66d23b1
3 changed files with 6 additions and 18 deletions

View file

@ -7,7 +7,7 @@ members = ["cli", "lib", "lib/gen-protos", "lib/proc-macros", "lib/testutils"]
[workspace.package]
version = "0.24.0"
license = "Apache-2.0"
rust-version = "1.76" # NOTE: remember to update CI, rust-toolchain.toml, contributing.md, changelog.md, install-and-setup.md, and flake.nix
rust-version = "1.76" # NOTE: remember to update CI, contributing.md, changelog.md, install-and-setup.md, and flake.nix
edition = "2021"
readme = "README.md"
homepage = "https://github.com/martinvonz/jj"

View file

@ -133,13 +133,16 @@ recommended steps.
One-time setup:
rustup toolchain add nightly # wanted for 'rustfmt'
cargo install cargo-insta cargo-watch cargo-nextest
rustup toolchain add 1.76 # also specified in Cargo.toml
cargo install cargo-insta
cargo install cargo-watch
cargo install cargo-nextest
During development (adapt according to your preference):
cargo watch --ignore '.jj/**' -s \
'cargo clippy --workspace --all-targets \
&& cargo check --workspace --all-targets'
&& cargo +1.76 check --workspace --all-targets'
cargo +nightly fmt # Occasionally
cargo nextest run --workspace # Occasionally
cargo insta test --workspace --test-runner nextest # Occasionally
@ -186,17 +189,6 @@ These are listed roughly in order of decreasing importance.
On Linux, you may be able to speed up `nextest` even further by using
the `mold` linker, as explained below.
### Using an alternative Rust compiler version
To use a different version of the Rust compiler/toolchain for development, you
can run:
rustup override set 1.80 # or any other version
Or manually set it in individual `cargo` commands:
cargo +1.80 clippy --workspace --all-targets # or any other version
### Using `mold` for faster tests on Linux
On a machine with a multi-core CPU, one way to speed up

View file

@ -1,4 +0,0 @@
[toolchain]
channel = "1.76"
profile = "default"
components = ["rust-analyzer"]