Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

docs: mention that that Rust 1.76 is required to install from source #4677

Merged
merged 1 commit into from
Oct 19, 2024
Merged

docs: mention that that Rust 1.76 is required to install from source #4677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 8 additions & 6 deletions docs/install-and-setup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down