Skip to content

Commit

Permalink
Update zlib
Browse files Browse the repository at this point in the history
- Updated zlib
- Use latest openssl-sys for armv6 again
- updated GHA Libs
  • Loading branch information
BlackDex committed Jan 24, 2024
1 parent 8ce562c commit 0950360
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rust-musl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ jobs:
fi
- name: Cache previous rustc stable hash
uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
if: ${{ !env.ACT }}
with:
path: ~/rustc-stable.hash
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.musl-base
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ ENV TARGET="${TARGET}" \
# Library versions
SSL_VER="3.0.12" \
CURL_VER="8.5.0" \
ZLIB_VER="1.3" \
ZLIB_VER="1.3.1" \
PQ_11_VER="11.22" \
PQ_15_VER="15.5" \
SQLITE_VER="3450000" \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ All versions of Rust v1.71.0 and above will all be build with MUSL v1.2.3 since
The following libraries are pre-build and marked as `STATIC` already via `ENV` variables so that the Rust Crates know there are static libraries available already.
* OpenSSL v3.0 (`v3.0.12`)
* cURL (`v8.5.0`)
* ZLib (`v1.3`)
* ZLib (`v1.3.1`)
* PostgreSQL lib (`v11.22`) and PostgreSQL lib (`v15.5`)
* SQLite (`v3.45.0`)
* MariaDB Connector/C (`v3.3.8`) (MySQL Compatible)
Expand Down
10 changes: 5 additions & 5 deletions test/multicrate/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[package]
authors = ["BlackDex <[email protected]>"]
name = "multicrate"
version = "0.4.1"
version = "0.4.2"
edition = "2021"
resolver = "2"

[features]
default = []
vendored_openssl = ["openssl/vendored"]

[target.arm-unknown-linux-musleabi.dependencies.openssl-sys]
version = "=0.9.92" # Fixed to v0.9.92 to prevent building issues with armv6
# [target.arm-unknown-linux-musleabi.dependencies.openssl-sys]
# version = "=0.9.92" # Fixed to v0.9.92 to prevent building issues with armv6

[dependencies]
# Make sure OpenSSL gets build, needed for Diesel, Curl and OpenSSL tests
Expand Down Expand Up @@ -47,9 +47,9 @@ features = ["zlib"]
# Strip symbols from the release builds
# https://doc.rust-lang.org/stable/rustc/codegen-options/index.html#strip
# https://doc.rust-lang.org/stable/cargo/reference/profiles.html#strip
# Also enable thin LTO for some optimizations
# Also enable fat LTO for some optimizations
# https://doc.rust-lang.org/stable/rustc/codegen-options/index.html#lto
# https://doc.rust-lang.org/stable/cargo/reference/profiles.html#lto
[profile.release]
strip = "symbols"
lto = "thin"
lto = "fat"

0 comments on commit 0950360

Please sign in to comment.