Openssl feature (#5352)

* Move statically linked OpenSSL behind a feature

* Re-add README.txt for releases
This commit is contained in:
Reilly Wood 2022-04-28 04:33:17 -07:00 committed by GitHub
parent 4ec4649903
commit d2bc2dcbb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 11 deletions

View File

@ -27,7 +27,7 @@ jobs:
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: with:
command: build command: build
args: --release --all --features=extra args: --release --all --features=extra,static-link-openssl
# - name: Strip binaries (nu) # - name: Strip binaries (nu)
# run: strip target/release/nu # run: strip target/release/nu
@ -89,14 +89,10 @@ jobs:
- name: Copy files to output - name: Copy files to output
run: | run: |
cp target/release/nu target/release/nu_plugin_* output/ cp target/release/nu target/release/nu_plugin_* output/
cp README.build.txt output/README.txt cp README.release.txt output/README.txt
cp LICENSE output/LICENSE cp LICENSE output/LICENSE
rm output/*.d rm output/*.d
# Note: If OpenSSL changes, this path will need to be updated
- name: Copy OpenSSL to output
run: cp /usr/lib/x86_64-linux-gnu/libssl.so.1.1 output/
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
@ -121,7 +117,7 @@ jobs:
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: with:
command: build command: build
args: --release --all --features=extra args: --release --all --features=extra,static-link-openssl
# - name: Strip binaries (nu) # - name: Strip binaries (nu)
# run: strip target/release/nu # run: strip target/release/nu
@ -183,7 +179,7 @@ jobs:
- name: Copy files to output - name: Copy files to output
run: | run: |
cp target/release/nu target/release/nu_plugin_* output/ cp target/release/nu target/release/nu_plugin_* output/
cp README.build.txt output/README.txt cp README.release.txt output/README.txt
cp LICENSE output/LICENSE cp LICENSE output/LICENSE
rm output/*.d rm output/*.d
@ -217,7 +213,7 @@ jobs:
uses: actions-rs/cargo@v1 uses: actions-rs/cargo@v1
with: with:
command: build command: build
args: --release --all --features=extra args: --release --all --features=extra,static-link-openssl
# - name: Strip binaries (nu.exe) # - name: Strip binaries (nu.exe)
# run: strip target/release/nu.exe # run: strip target/release/nu.exe
@ -288,7 +284,7 @@ jobs:
cp LICENSE output\ cp LICENSE output\
cp target\release\LICENSE-for-less.txt output\ cp target\release\LICENSE-for-less.txt output\
cp target\release\nu_plugin_*.exe output\ cp target\release\nu_plugin_*.exe output\
cp README.build.txt output\README.txt cp README.release.txt output\README.txt
cp target\release\less.exe output\ cp target\release\less.exe output\
# Note: If the version of `less.exe` needs to be changed, update this URL # Note: If the version of `less.exe` needs to be changed, update this URL
# Similarly, if `less.exe` is checked into the repo, copy from the local path here # Similarly, if `less.exe` is checked into the repo, copy from the local path here

View File

@ -51,7 +51,7 @@ nu-protocol = { path = "./crates/nu-protocol", version = "0.61.1" }
nu-system = { path = "./crates/nu-system", version = "0.61.1" } nu-system = { path = "./crates/nu-system", version = "0.61.1" }
nu-table = { path = "./crates/nu-table", version = "0.61.1" } nu-table = { path = "./crates/nu-table", version = "0.61.1" }
nu-term-grid = { path = "./crates/nu-term-grid", version = "0.61.1" } nu-term-grid = { path = "./crates/nu-term-grid", version = "0.61.1" }
openssl = { version = "0.10.38", features = ["vendored"] } # Force subdependencies to statically link OpenSSL openssl = { version = "0.10.38", features = ["vendored"], optional = true }
pretty_env_logger = "0.4.0" pretty_env_logger = "0.4.0"
rayon = "1.5.1" rayon = "1.5.1"
reedline = { git = "https://github.com/nushell/reedline", branch = "main", features = ["bashisms"]} reedline = { git = "https://github.com/nushell/reedline", branch = "main", features = ["bashisms"]}
@ -76,6 +76,8 @@ default = ["plugin", "which-support", "trash-support"]
stable = ["default"] stable = ["default"]
extra = ["default", "dataframe", "database"] extra = ["default", "dataframe", "database"]
wasi = [] wasi = []
# Enable to statically link OpenSSL; otherwise the system version will be used. Not enabled by default because it takes a while to build
static-link-openssl = ["dep:openssl"]
# Stable (Default) # Stable (Default)
which-support = ["nu-command/which-support"] which-support = ["nu-command/which-support"]

3
README.release.txt Normal file
View File

@ -0,0 +1,3 @@
To use Nu plugins, use the register command to tell Nu where to find the plugin. For example:
> register -e json ./nu_plugin_query