Enable musl target builds with vendored libgit2 (#4991)
* enable musl target builds with vendored libgit2 * move git2 to bottom of list * also fix dioxus fullstack docs builds --------- Co-authored-by: Jonathan Kelley <jkelleyrtp@gmail.com>
This commit is contained in:
1 parent
fc0fbb2561
commit
3fef7a9962
3 files changed
+7
-7
No files matched your search
@@ -63,10 +63,10 @@ jobs:
|
|||||||
os: ubuntu-24.04-arm
|
os: ubuntu-24.04-arm
|
||||||
# os: blacksmith-4vcpu-ubuntu-2404
|
# os: blacksmith-4vcpu-ubuntu-2404
|
||||||
# os: blacksmith-4vcpu-ubuntu-2404
|
# os: blacksmith-4vcpu-ubuntu-2404
|
||||||
# - target: x86_64-unknown-linux-musl
|
- target: x86_64-unknown-linux-musl
|
||||||
# os: ubuntu-24.04
|
os: ubuntu-24.04
|
||||||
# - target: aarch64-unknown-linux-musl
|
- target: aarch64-unknown-linux-musl
|
||||||
# os: ubuntu-24.04-arm
|
os: ubuntu-24.04-arm
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v5
|
uses: actions/checkout@v5
|
||||||
|
|||||||
@@ -168,6 +168,9 @@ nucleo = "0.5.0"
|
|||||||
# 0.5.12 rust-version is too high
|
# 0.5.12 rust-version is too high
|
||||||
home = "=0.5.11"
|
home = "=0.5.11"
|
||||||
|
|
||||||
|
[target.'cfg(target_env = "musl")'.dependencies]
|
||||||
|
git2 = { version = "0.20.2", features = ["vendored-libgit2"] }
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
built = { version = "0.8.0", features = ["git2"] }
|
built = { version = "0.8.0", features = ["git2"] }
|
||||||
|
|
||||||
|
|||||||
@@ -826,7 +826,6 @@ pub enum WebsocketError {
|
|||||||
Uninitialized,
|
Uninitialized,
|
||||||
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
#[cfg_attr(docsrs, doc(cfg(not(target_arch = "wasm32"))))]
|
|
||||||
#[error("websocket upgrade failed")]
|
#[error("websocket upgrade failed")]
|
||||||
Handshake(#[from] native::HandshakeError),
|
Handshake(#[from] native::HandshakeError),
|
||||||
|
|
||||||
@@ -834,7 +833,6 @@ pub enum WebsocketError {
|
|||||||
Reqwest(#[from] reqwest::Error),
|
Reqwest(#[from] reqwest::Error),
|
||||||
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
#[cfg_attr(docsrs, doc(cfg(not(target_arch = "wasm32"))))]
|
|
||||||
#[error("tungstenite error")]
|
#[error("tungstenite error")]
|
||||||
Tungstenite(#[from] tungstenite::Error),
|
Tungstenite(#[from] tungstenite::Error),
|
||||||
|
|
||||||
@@ -848,7 +846,6 @@ pub enum WebsocketError {
|
|||||||
|
|
||||||
/// Error during serialization/deserialization.
|
/// Error during serialization/deserialization.
|
||||||
#[error("serde_json error")]
|
#[error("serde_json error")]
|
||||||
#[cfg_attr(docsrs, doc(cfg(feature = "json")))]
|
|
||||||
Json(#[from] serde_json::Error),
|
Json(#[from] serde_json::Error),
|
||||||
|
|
||||||
/// Error during serialization/deserialization.
|
/// Error during serialization/deserialization.
|
||||||
|
|||||||
Reference in new issue
Block a user