mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-12 23:23:20 +00:00
docs: mention that that Rust 1.76 is required to install from source
Some checks failed
binaries / Build binary artifacts (linux-aarch64-gnu, ubuntu-24.04, aarch64-unknown-linux-gnu) (push) Has been cancelled
binaries / Build binary artifacts (linux-aarch64-musl, ubuntu-24.04, aarch64-unknown-linux-musl) (push) Has been cancelled
binaries / Build binary artifacts (linux-x86_64-gnu, ubuntu-24.04, x86_64-unknown-linux-gnu) (push) Has been cancelled
binaries / Build binary artifacts (linux-x86_64-musl, ubuntu-24.04, x86_64-unknown-linux-musl) (push) Has been cancelled
binaries / Build binary artifacts (macos-aarch64, macos-14, aarch64-apple-darwin) (push) Has been cancelled
binaries / Build binary artifacts (macos-x86_64, macos-13, x86_64-apple-darwin) (push) Has been cancelled
binaries / Build binary artifacts (win-x86_64, windows-2022, x86_64-pc-windows-msvc) (push) Has been cancelled
nix / flake check (macos-14) (push) Has been cancelled
nix / flake check (ubuntu-latest) (push) Has been cancelled
build / build (, macos-13) (push) Has been cancelled
build / build (, macos-14) (push) Has been cancelled
build / build (, ubuntu-latest) (push) Has been cancelled
build / build (, windows-latest) (push) Has been cancelled
build / build (--all-features, ubuntu-latest) (push) Has been cancelled
build / Build jj-lib without Git support (push) Has been cancelled
build / Check protos (push) Has been cancelled
build / Check formatting (push) Has been cancelled
build / Check that MkDocs can build the docs (push) Has been cancelled
build / Check that MkDocs can build the docs with Poetry 1.8 (push) Has been cancelled
build / cargo-deny (advisories) (push) Has been cancelled
build / cargo-deny (bans licenses sources) (push) Has been cancelled
build / Clippy check (push) Has been cancelled
Codespell / Codespell (push) Has been cancelled
website / prerelease-docs-build-deploy (ubuntu-latest) (push) Has been cancelled
Scorecards supply-chain security / Scorecards analysis (push) Has been cancelled
Some checks failed
binaries / Build binary artifacts (linux-aarch64-gnu, ubuntu-24.04, aarch64-unknown-linux-gnu) (push) Has been cancelled
binaries / Build binary artifacts (linux-aarch64-musl, ubuntu-24.04, aarch64-unknown-linux-musl) (push) Has been cancelled
binaries / Build binary artifacts (linux-x86_64-gnu, ubuntu-24.04, x86_64-unknown-linux-gnu) (push) Has been cancelled
binaries / Build binary artifacts (linux-x86_64-musl, ubuntu-24.04, x86_64-unknown-linux-musl) (push) Has been cancelled
binaries / Build binary artifacts (macos-aarch64, macos-14, aarch64-apple-darwin) (push) Has been cancelled
binaries / Build binary artifacts (macos-x86_64, macos-13, x86_64-apple-darwin) (push) Has been cancelled
binaries / Build binary artifacts (win-x86_64, windows-2022, x86_64-pc-windows-msvc) (push) Has been cancelled
nix / flake check (macos-14) (push) Has been cancelled
nix / flake check (ubuntu-latest) (push) Has been cancelled
build / build (, macos-13) (push) Has been cancelled
build / build (, macos-14) (push) Has been cancelled
build / build (, ubuntu-latest) (push) Has been cancelled
build / build (, windows-latest) (push) Has been cancelled
build / build (--all-features, ubuntu-latest) (push) Has been cancelled
build / Build jj-lib without Git support (push) Has been cancelled
build / Check protos (push) Has been cancelled
build / Check formatting (push) Has been cancelled
build / Check that MkDocs can build the docs (push) Has been cancelled
build / Check that MkDocs can build the docs with Poetry 1.8 (push) Has been cancelled
build / cargo-deny (advisories) (push) Has been cancelled
build / cargo-deny (bans licenses sources) (push) Has been cancelled
build / Clippy check (push) Has been cancelled
Codespell / Codespell (push) Has been cancelled
website / prerelease-docs-build-deploy (ubuntu-latest) (push) Has been cancelled
Scorecards supply-chain security / Scorecards analysis (push) Has been cancelled
We have our MSRV recorded in `Cargo.toml`, but at least with Rust versions < 1.71, the build fails before the MSRV is checked (IIUC), and you get a cryptic message like this: ``` error: Package jj-lib v0.22.0 (<some path>) does not have feature git2. ``` The message is clearer from 1.71, but that doesn't help users who have an older version. Let's mention the MSRV everywhere we tell the user to run `cargo` in the installation instructions.
This commit is contained in:
parent
d14c00db41
commit
e00f6f121e
2 changed files with 9 additions and 7 deletions
|
@ -7,7 +7,7 @@ members = ["cli", "lib", "lib/gen-protos", "lib/proc-macros", "lib/testutils"]
|
|||
[workspace.package]
|
||||
version = "0.22.0"
|
||||
license = "Apache-2.0"
|
||||
rust-version = "1.76" # NOTE: remember to update CI, contributing.md, changelog.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"
|
||||
|
|
|
@ -30,8 +30,9 @@ be compiled from the same source code.
|
|||
|
||||
#### From Source
|
||||
|
||||
First make sure that you have the `libssl-dev`, `openssl`, `pkg-config`, and
|
||||
`build-essential` packages installed by running something like this:
|
||||
First make sure that you have a Rust version >= 1.76 and that the `libssl-dev`,
|
||||
`openssl`, `pkg-config`, and `build-essential` packages are installed by running
|
||||
something like this:
|
||||
|
||||
```shell
|
||||
sudo apt-get install libssl-dev openssl pkg-config build-essential
|
||||
|
@ -109,7 +110,7 @@ emerge -av dev-vcs/jj
|
|||
|
||||
#### From Source, Vendored OpenSSL
|
||||
|
||||
You may need to run:
|
||||
First make sure that you have a Rust version >= 1.76. You may also need to run:
|
||||
|
||||
```shell
|
||||
xcode-select --install
|
||||
|
@ -132,8 +133,9 @@ cargo install --features vendored-openssl -locked --bin jj jj-cli
|
|||
|
||||
#### From Source, Homebrew OpenSSL
|
||||
|
||||
You will need [Homebrew](https://brew.sh/) installed. You may then need to run
|
||||
some or all of these:
|
||||
First make sure that you have a Rust version >= 1.76. You will also need
|
||||
[Homebrew](https://brew.sh/) installed. You may then need to run some or all of
|
||||
these:
|
||||
|
||||
```shell
|
||||
xcode-select --install
|
||||
|
@ -178,7 +180,7 @@ sudo port install jujutsu
|
|||
|
||||
### Windows
|
||||
|
||||
Run either:
|
||||
First make sure that you have a Rust version >= 1.76. Now run either:
|
||||
|
||||
```shell
|
||||
# To install the *prerelease* version from the main branch
|
||||
|
|
Loading…
Reference in a new issue