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

Static link openssl for ckb-cli #568

Merged
merged 9 commits into from
Dec 20, 2023
Merged

Static link openssl for ckb-cli #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
25c0a2c
Use native-tls-vendored feature for `ckb-sdk` to static link openssl
eval-exec Dec 14, 2023
618775d
Update Cargo.lock by `make prod`
eval-exec Dec 14, 2023
a5b4a4c
Upgrade ckb-sdk-rust to 3.0.1
eval-exec Dec 14, 2023
ddafd94
Fix get_fee_rate_statistics return an Option
eval-exec Dec 14, 2023
03f97cf
Update Cargo.lock by `make prod`
eval-exec Dec 14, 2023
1d78681
Package workflow do not need openssl env anymore
eval-exec Dec 14, 2023
3be5d9f
Upgrade ahash to 0.7.7
eval-exec Dec 18, 2023
1e26d69
Upgrade ckb-cli to `1.6.0`
eval-exec Dec 14, 2023
24cbf99
Update ckb-cli:1.6.0's Cargo.lock
eval-exec Dec 14, 2023
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
16 changes: 4 additions & 12 deletions .github/workflows/package.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
GPG_SIGNER: ${{ secrets.GPG_SIGNER }}
run: |
export GIT_TAG_NAME=` echo ${{ github.ref }} | awk -F '/' '{print $4}' `
docker run --rm -i -w /ckb-cli -v $(pwd):/ckb-cli -e OPENSSL_STATIC=1 $BUILDER_IMAGE make prod
docker run --rm -i -w /ckb-cli -v $(pwd):/ckb-cli $BUILDER_IMAGE make prod
gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output devtools/ci/signer.asc devtools/ci/signer.asc.gpg
gpg --import devtools/ci/signer.asc
devtools/ci/package.sh target/release/ckb-cli
Expand Down Expand Up @@ -91,15 +91,7 @@ jobs:
run: |
export GIT_TAG_NAME=` echo ${{ github.ref }} | awk -F '/' '{print $4}' `
export TOP_DIR=$(pwd)
curl -LO https://www.openssl.org/source/openssl-1.1.1.tar.gz
tar -xzf openssl-1.1.1.tar.gz
cd openssl-1.1.1
CC=aarch64-linux-gnu-gcc ./Configure linux-aarch64 no-shared
CC=aarch64-linux-gnu-gcc make
cd ..
export OPENSSL_LIB_DIR=${TOP_DIR}/openssl-1.1.1
export OPENSSL_INCLUDE_DIR=${TOP_DIR}/openssl-1.1.1/include
PKG_CONFIG_ALLOW_CROSS=1 OPENSSL_STATIC=1 CC=gcc CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc cargo build --target=aarch64-unknown-linux-gnu --release
PKG_CONFIG_ALLOW_CROSS=1 CC=gcc CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc cargo build --target=aarch64-unknown-linux-gnu --release
gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output devtools/ci/signer.asc devtools/ci/signer.asc.gpg
gpg --import devtools/ci/signer.asc
devtools/ci/package.sh target/aarch64-unknown-linux-gnu/release/ckb-cli
Expand Down Expand Up @@ -168,7 +160,7 @@ jobs:
GPG_SIGNER: ${{ secrets.GPG_SIGNER }}
run: |
export GIT_TAG_NAME=` echo ${{ github.ref }} | awk -F '/' '{print $4}' `
make OPENSSL_STATIC=1 OPENSSL_LIB_DIR=/usr/local/opt/[email protected]/lib OPENSSL_INCLUDE_DIR=/usr/local/opt/[email protected]/include prod
make prod
gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output devtools/ci/signer.asc devtools/ci/signer.asc.gpg
gpg --import devtools/ci/signer.asc
devtools/ci/package.sh target/release/ckb-cli
Expand Down Expand Up @@ -219,7 +211,7 @@ jobs:
GPG_SIGNER: ${{ secrets.GPG_SIGNER }}
run: |
export GIT_TAG_NAME=` echo ${{ github.ref }} | awk -F '/' '{print $4}' `
make OPENSSL_STATIC=1 OPENSSL_LIB_DIR=/usr/local/opt/[email protected]/lib OPENSSL_INCLUDE_DIR=/usr/local/opt/[email protected]/include prod
make prod
gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output devtools/ci/signer.asc devtools/ci/signer.asc.gpg
gpg --import devtools/ci/signer.asc
devtools/ci/package.sh target/release/ckb-cli
Expand Down
20 changes: 15 additions & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-cli"
version = "1.5.0"
version = "1.6.0"
license = "MIT"
authors = ["Linfeng Qian <[email protected]>", "Nervos Core Dev <[email protected]>"]
edition = "2021"
Expand All @@ -17,7 +17,7 @@ ckb-error = "=0.111.0"
ckb-script = "=0.111.0"
ckb-chain-spec = "=0.111.0"
ckb-mock-tx-types = "=0.111.0"
ckb-sdk = "3.0.0"
ckb-sdk = { version="3.0.1",features = ["native-tls-vendored"] }
ckb-signer = { path = "ckb-signer", version = "0.4.0" }
plugin-protocol = { path = "plugin-protocol", package = "ckb-cli-plugin-protocol", version = "=1.3.0" }
jsonrpc-core-client = "18"
Expand Down
4 changes: 2 additions & 2 deletions src/utils/rpc/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,10 @@ impl HttpRpcClient {
pub fn get_fee_rate_statistics(
&mut self,
target: Option<u64>,
) -> Result<types::FeeRateStatistics, String> {
) -> Result<Option<types::FeeRateStatistics>, String> {
self.client
.get_fee_rate_statics(target.map(Into::into))
.map(Into::into)
.map(|fee_rate_statistics| fee_rate_statistics.map(Into::into))
.map_err(|err| err.to_string())
}
pub fn get_deployments_info(&mut self) -> Result<types::DeploymentsInfo, String> {
Expand Down
Loading