Skip to content

Commit

Permalink
build: don't use vendored OpenSSL by default
Browse files Browse the repository at this point in the history
I added support for using a vendored OpenSSL in dbadbd6. That was
in order to get the musl binary to work. However, it shouldn't be
needed on most platforms, and we've had a few reports of issues caused
by it. Let's disable it by default and enable it specifically when
building the musl binary instead.
  • Loading branch information
martinvonz committed Jan 4, 2023
1 parent 9763a4d commit 635f5a5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ jobs:
target: ${{ matrix.target }}
- name: Build release binary
run: cargo build --target ${{ matrix.target }} --verbose --release
- name: (re-)Build release binary with vendored OpenSSL
if: matrix.os != 'ubuntu-20.04' && matrix.os != 'macos-11'
run: cargo build --target ${{ matrix.target }} --verbose --release --features vendored-openssl
- name: Build archive
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,5 @@ test-case = "2.2.2"
testutils = { path = "lib/testutils" }

[features]
default = ["vendored-openssl", "jujutsu-lib/legacy-thrift"]
default = ["jujutsu-lib/legacy-thrift"]
vendored-openssl = ["git2/vendored-openssl", "jujutsu-lib/vendored-openssl"]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ cargo install --git https://github.com/martinvonz/jj.git --bin jj jujutsu

Run:
```shell script
cargo install --git https://github.com/martinvonz/jj.git --bin jj jujutsu
cargo install --git https://github.com/martinvonz/jj.git --bin jj jujutsu --features vendored-openssl
```


Expand Down

0 comments on commit 635f5a5

Please sign in to comment.