ok/jj
1
0
Fork 0
forked from mirrors/jj

build: don't use vendored OpenSSL by default

I added support for using a vendored OpenSSL in dbadbd68c0. 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.
This commit is contained in:
Martin von Zweigbergk 2023-01-03 15:40:03 -08:00 committed by Martin von Zweigbergk
parent 9763a4d689
commit 635f5a5cb8
3 changed files with 5 additions and 2 deletions

View file

@ -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: |

View file

@ -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"]

View file

@ -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
```