diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6afa5ce202..2c334391bd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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: | diff --git a/Cargo.toml b/Cargo.toml index 0be3957628..6e93919727 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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"] diff --git a/README.md b/README.md index cdb79c93fb..953aae1fb9 100644 --- a/README.md +++ b/README.md @@ -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 ```