From cfe4db4b309404150d4a5df1aa18dab7a548bb25 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 28 Jan 2025 00:51:29 +0100 Subject: [PATCH 01/54] add --zig flag --- .github/workflows/CI.yml | 43 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f4693d7..87af861 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -10,6 +10,7 @@ permissions: push: branches: - main + - feat/aarch64 tags-ignore: - '**' paths-ignore: @@ -25,35 +26,35 @@ jobs: fail-fast: false matrix: settings: - - host: macos-latest - target: x86_64-apple-darwin - build: | - yarn build --target x86_64-apple-darwin - strip -x *.node - - host: windows-latest - build: yarn build - target: x86_64-pc-windows-msvc - - host: ubuntu-22.04 - target: x86_64-unknown-linux-gnu - build: |- - set -e && - yarn build --target x86_64-unknown-linux-gnu && - strip *.node - - host: macos-latest - target: aarch64-apple-darwin - build: | - yarn build --target aarch64-apple-darwin - strip -x *.node + # - host: macos-latest + # target: x86_64-apple-darwin + # build: | + # yarn build --target x86_64-apple-darwin + # strip -x *.node + # - host: windows-latest + # build: yarn build + # target: x86_64-pc-windows-msvc + # - host: ubuntu-22.04 + # target: x86_64-unknown-linux-gnu + # build: |- + # set -e && + # yarn build --target x86_64-unknown-linux-gnu && + # strip *.node + # - host: macos-latest + # target: aarch64-apple-darwin + # build: | + # yarn build --target aarch64-apple-darwin + # strip -x *.node - host: ubuntu-latest target: aarch64-unknown-linux-gnu docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 - build: yarn build --target aarch64-unknown-linux-gnu + build: yarn build --zig --target aarch64-unknown-linux-gnu - host: ubuntu-latest target: armv7-unknown-linux-gnueabihf setup: | sudo apt-get update sudo apt-get install gcc-arm-linux-gnueabihf -y - build: yarn build --target armv7-unknown-linux-gnueabihf + build: yarn build --zig --target armv7-unknown-linux-gnueabihf name: stable - ${{ matrix.settings.target }} - node@20 runs-on: ${{ matrix.settings.host }} From 67078f9e7cc29cc6de7edaced4f515e5dc36f56f Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 28 Jan 2025 00:58:47 +0100 Subject: [PATCH 02/54] add aarch64 to setup zig step --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 87af861..4b29d94 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -92,7 +92,7 @@ jobs: go-version: 'stable' - uses: goto-bus-stop/setup-zig@v2 - if: ${{ matrix.settings.target == 'armv7-unknown-linux-gnueabihf' || matrix.settings.target == 'armv7-unknown-linux-musleabihf' }} + if: ${{ matrix.settings.target == 'aarch64-unknown-linux-gnu' || matrix.settings.target == 'armv7-unknown-linux-gnueabihf' || matrix.settings.target == 'armv7-unknown-linux-musleabihf' }} with: version: 0.11.0 From 92bfacedabc2316f79abad0f5d1b186cbefb889d Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 28 Jan 2025 01:04:39 +0100 Subject: [PATCH 03/54] echo zig --- .github/workflows/CI.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4b29d94..e8d1a46 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -48,7 +48,10 @@ jobs: - host: ubuntu-latest target: aarch64-unknown-linux-gnu docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 - build: yarn build --zig --target aarch64-unknown-linux-gnu + build: | + zig --version + echo $PATH + yarn build --zig --target aarch64-unknown-linux-gnu - host: ubuntu-latest target: armv7-unknown-linux-gnueabihf setup: | From 9732be9de03d004b0b31cc1859914c043d7fe4ac Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 28 Jan 2025 01:12:51 +0100 Subject: [PATCH 04/54] add install zig command --- .github/workflows/CI.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e8d1a46..f0cba26 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -49,15 +49,15 @@ jobs: target: aarch64-unknown-linux-gnu docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 build: | - zig --version - echo $PATH - yarn build --zig --target aarch64-unknown-linux-gnu - - host: ubuntu-latest - target: armv7-unknown-linux-gnueabihf - setup: | sudo apt-get update - sudo apt-get install gcc-arm-linux-gnueabihf -y - build: yarn build --zig --target armv7-unknown-linux-gnueabihf + sudo apt-get install zig + yarn build --zig --target aarch64-unknown-linux-gnu + # - host: ubuntu-latest + # target: armv7-unknown-linux-gnueabihf + # setup: | + # sudo apt-get update + # sudo apt-get install gcc-arm-linux-gnueabihf -y + # build: yarn build --zig --target armv7-unknown-linux-gnueabihf name: stable - ${{ matrix.settings.target }} - node@20 runs-on: ${{ matrix.settings.host }} @@ -95,7 +95,7 @@ jobs: go-version: 'stable' - uses: goto-bus-stop/setup-zig@v2 - if: ${{ matrix.settings.target == 'aarch64-unknown-linux-gnu' || matrix.settings.target == 'armv7-unknown-linux-gnueabihf' || matrix.settings.target == 'armv7-unknown-linux-musleabihf' }} + if: ${{ matrix.settings.target == 'armv7-unknown-linux-gnueabihf' || matrix.settings.target == 'armv7-unknown-linux-musleabihf' }} with: version: 0.11.0 From 0affdb5a3f4159acde08c9cea824b7f60c719377 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 28 Jan 2025 01:17:27 +0100 Subject: [PATCH 05/54] install zig from snap --- .github/workflows/CI.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f0cba26..50065e3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -49,8 +49,7 @@ jobs: target: aarch64-unknown-linux-gnu docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 build: | - sudo apt-get update - sudo apt-get install zig + snap install zig --classic --beta yarn build --zig --target aarch64-unknown-linux-gnu # - host: ubuntu-latest # target: armv7-unknown-linux-gnueabihf From 8c55e5444003995f9b4c9df46119bf9913bd740a Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 28 Jan 2025 01:25:49 +0100 Subject: [PATCH 06/54] add zig installation step --- .github/workflows/CI.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 50065e3..39c7d64 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -49,7 +49,10 @@ jobs: target: aarch64-unknown-linux-gnu docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 build: | - snap install zig --classic --beta + curl --output zig-linux-aarch64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-aarch64-0.13.0.tar.xz + tar xf zig-linux-aarch64-0.13.0.tar.xz + echo 'export PATH="$HOME/zig-linux-x86_64-0.13.0:$PATH"' >> ~/.bashrc + zig version yarn build --zig --target aarch64-unknown-linux-gnu # - host: ubuntu-latest # target: armv7-unknown-linux-gnueabihf From 3d2e49f224d554905b386e78b0fa8bd246697892 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 28 Jan 2025 01:30:07 +0100 Subject: [PATCH 07/54] add logging --- .github/workflows/CI.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 39c7d64..23b13d9 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -49,9 +49,14 @@ jobs: target: aarch64-unknown-linux-gnu docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 build: | + echo "fetching zig tar" curl --output zig-linux-aarch64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-aarch64-0.13.0.tar.xz + echo "unzipping zig" tar xf zig-linux-aarch64-0.13.0.tar.xz + ls + echo "exporting path" echo 'export PATH="$HOME/zig-linux-x86_64-0.13.0:$PATH"' >> ~/.bashrc + echo "zig version" zig version yarn build --zig --target aarch64-unknown-linux-gnu # - host: ubuntu-latest From 6e335ccb7b74485f0950fa3d48a21ef8bf39cb89 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 28 Jan 2025 01:33:59 +0100 Subject: [PATCH 08/54] pwd --- .github/workflows/CI.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 23b13d9..832be9c 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -53,9 +53,10 @@ jobs: curl --output zig-linux-aarch64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-aarch64-0.13.0.tar.xz echo "unzipping zig" tar xf zig-linux-aarch64-0.13.0.tar.xz + pwd ls echo "exporting path" - echo 'export PATH="$HOME/zig-linux-x86_64-0.13.0:$PATH"' >> ~/.bashrc + echo 'export PATH="$(pwd)/zig-linux-x86_64-0.13.0:$PATH"' >> ~/.bashrc echo "zig version" zig version yarn build --zig --target aarch64-unknown-linux-gnu From 4ee626eb20acd8f5b70c7d46f65f03a8dda2186d Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 28 Jan 2025 01:40:28 +0100 Subject: [PATCH 09/54] change path --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 832be9c..41cc40a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -56,7 +56,7 @@ jobs: pwd ls echo "exporting path" - echo 'export PATH="$(pwd)/zig-linux-x86_64-0.13.0:$PATH"' >> ~/.bashrc + echo 'export PATH="/build/zig-linux-x86_64-0.13.0:$PATH"' >> ~/.bashrc echo "zig version" zig version yarn build --zig --target aarch64-unknown-linux-gnu From 497dbd89d2397e167375d59e68ee99cd608240f1 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 12 May 2025 11:32:59 +0200 Subject: [PATCH 10/54] removed conductor config generation file and holochain_conductor_api dependency --- Cargo.lock | 29 ------- Cargo.toml | 1 - src/conductor_config.rs | 163 ---------------------------------------- src/lib.rs | 1 - 4 files changed, 194 deletions(-) delete mode 100644 src/conductor_config.rs diff --git a/Cargo.lock b/Cargo.lock index 226b045..aaf94ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1410,34 +1410,6 @@ dependencies = [ "url", ] -[[package]] -name = "holochain_conductor_api" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f68ad382269e7846979a1dbd955a2915df4b6c512b60546bf26ccff568d4109c" -dependencies = [ - "cfg-if 1.0.0", - "derive_more 0.99.17", - "holo_hash", - "holochain_keystore", - "holochain_serialized_bytes", - "holochain_state_types", - "holochain_types", - "holochain_util", - "holochain_zome_types", - "indexmap 2.9.0", - "kitsune2_api", - "kitsune2_core", - "schemars", - "serde", - "serde_json", - "serde_yaml 0.9.34+deprecated", - "shrinkwraprs", - "thiserror 1.0.61", - "tracing", - "url2", -] - [[package]] name = "holochain_integrity_types" version = "0.5.2" @@ -2475,7 +2447,6 @@ version = "0.500.0-rc.3" dependencies = [ "futures", "hex", - "holochain_conductor_api", "holochain_p2p", "holochain_types", "lair_keystore_api", diff --git a/Cargo.toml b/Cargo.toml index 5713869..25f2875 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,6 @@ napi = { version = "2.12.2", default-features = false, features = [ ] } napi-derive = "2.12.2" -holochain_conductor_api = "0.5.2" holochain_p2p = "0.5.2" holochain_types = "0.5.2" lair_keystore_api = "0.6.1" diff --git a/src/conductor_config.rs b/src/conductor_config.rs deleted file mode 100644 index 78536bb..0000000 --- a/src/conductor_config.rs +++ /dev/null @@ -1,163 +0,0 @@ -#![deny(clippy::all)] - -use holochain_conductor_api::{ - conductor::{paths::DataRootPath, ConductorConfig, DpkiConfig, KeystoreConfig, NetworkConfig}, - AdminInterfaceConfig, InterfaceDriver, -}; -use holochain_types::websocket::AllowedOrigins; -use napi::{Error, Result, Status}; -use napi_derive::napi; -use std::{collections::HashSet, path::PathBuf}; - -fn create_error(msg: &str) -> Error { - Error::new(Status::GenericFailure, String::from(msg)) -} - -fn webrtc_config_from_ice_urls(ice_server_urls: Vec) -> serde_json::Value { - let mut webrtc_config = serde_json::Map::new(); - let mut ice_servers = Vec::new(); - for url in ice_server_urls { - let mut url_mapping = serde_json::Map::new(); - url_mapping.insert( - String::from("urls"), - serde_json::Value::Array(vec![serde_json::Value::String(url)]), - ); - ice_servers.push(serde_json::Value::Object(url_mapping)); - } - webrtc_config.insert( - String::from("iceServers"), - serde_json::Value::Array(ice_servers), - ); - serde_json::Value::Object(webrtc_config) -} - -#[napi] -pub fn overwrite_config( - admin_port: u16, - config_path: String, - keystore_connection_url: String, - bootstrap_server_url: String, - signaling_server_url: String, - allowed_origin: String, - signal_allow_plain_text: bool, - ice_server_urls: Option>, - keystore_in_proc_environment_dir: Option, -) -> Result { - let mut config = std::fs::read_to_string(&PathBuf::from(config_path)) - .map_err(|_| create_error("Failed to read file")) - .and_then(|contents| { - serde_yaml::from_str::(&contents) - .map_err(|_| create_error("Failed to parse conductor-config.yaml")) - })?; - - config.network.bootstrap_url = url2::url2!("{}", bootstrap_server_url); - config.network.signal_url = url2::url2!("{}", signaling_server_url); - config.network.webrtc_config = if ice_server_urls.is_some() { - Some(webrtc_config_from_ice_urls(ice_server_urls.unwrap())) - } else { - None - }; - - if signal_allow_plain_text { - config.network.advanced = Some(serde_json::json!({ - // Allow plaintext signal for testing, and set a short timeout for network requests - // so that shutting down a conductor won't keep tx5 busy for too long. - "tx5Transport": { - "signalAllowPlainText": true, - }, - })); - } - - config.admin_interfaces = Some(vec![AdminInterfaceConfig { - driver: InterfaceDriver::Websocket { - port: admin_port, - allowed_origins: AllowedOrigins::Origins(HashSet::from([allowed_origin])), - }, - }]); - - // If a keystore environment directory for in-process lair is provided, ignore - // the value passed with keystore_connection_url - config.keystore = match keystore_in_proc_environment_dir { - Some(path) => KeystoreConfig::LairServerInProc { - lair_root: Some(PathBuf::from(path).into()), - }, - None => KeystoreConfig::LairServer { - connection_url: url2::url2!("{}", keystore_connection_url), - }, - }; - - serde_yaml::to_string(&config) - .map_err(|_| create_error("Could not convert conductor config to string")) -} - -#[napi] -pub fn default_conductor_config( - admin_port: u16, - conductor_environment_path: String, - keystore_connection_url: String, - bootstrap_server_url: String, - signaling_server_url: String, - allowed_origin: String, - signal_allow_plain_text: bool, - ice_server_urls: Option>, - keystore_in_proc_environment_dir: Option, -) -> Result { - let mut network_config = NetworkConfig::default(); - network_config.bootstrap_url = url2::url2!("{}", bootstrap_server_url); - network_config.signal_url = url2::url2!("{}", signaling_server_url); - - let webrtc_config = match ice_server_urls { - Some(urls) => Some(webrtc_config_from_ice_urls(urls)), - None => None, - }; - - if signal_allow_plain_text { - network_config.advanced = Some(serde_json::json!({ - // Allow plaintext signal for testing, and set a short timeout for network requests - // so that shutting down a conductor won't keep tx5 busy for too long. - "tx5Transport": { - "signalAllowPlainText": true, - }, - })); - } - - network_config.webrtc_config = webrtc_config; - - let mut allowed_origins_map = HashSet::new(); - allowed_origins_map.insert(allowed_origin); - - // If a keystore environment directory for in-process lair is provided, ignore - // the value passed with keystore_connection_url - let keystore_config = match keystore_in_proc_environment_dir { - Some(path) => KeystoreConfig::LairServerInProc { - lair_root: Some(PathBuf::from(path).into()), - }, - None => KeystoreConfig::LairServer { - connection_url: url2::url2!("{}", keystore_connection_url), - }, - }; - - let config = ConductorConfig { - data_root_path: Some(DataRootPath::from(PathBuf::from( - conductor_environment_path, - ))), - dpki: DpkiConfig::disabled(), - device_seed_lair_tag: None, - danger_generate_throwaway_device_seed: false, - keystore: keystore_config, - admin_interfaces: Some(vec![AdminInterfaceConfig { - driver: InterfaceDriver::Websocket { - port: admin_port, - allowed_origins: AllowedOrigins::Origins(allowed_origins_map), - }, - }]), - network: network_config, - db_sync_strategy: Default::default(), - tracing_override: None, - tuning_params: None, - tracing_scope: None, - }; - - serde_yaml::to_string(&config) - .map_err(|_| create_error("Failed to convert conductor config to yaml string.")) -} diff --git a/src/lib.rs b/src/lib.rs index bb8e595..9500b52 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,7 +1,6 @@ #[macro_use] extern crate napi_derive; -pub mod conductor_config; pub mod decode_webapp; pub mod we_rust_handler; pub mod zome_call_signer; From a1ddb7f95bfb45e3777baad58c62182bc9b50361 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 12 May 2025 11:39:04 +0200 Subject: [PATCH 11/54] remove unused holochain_p2p dependency --- Cargo.lock | 1272 ++-------------------------------------------------- Cargo.toml | 1 - 2 files changed, 34 insertions(+), 1239 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aaf94ab..62c86d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -30,7 +30,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if 1.0.0", - "getrandom 0.2.15", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -130,18 +130,6 @@ version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" -[[package]] -name = "app_dirs2" -version = "2.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7e7b35733e3a8c1ccb90385088dd5b6eaa61325cb4d1ad56e683b5224ff352e" -dependencies = [ - "jni", - "ndk-context", - "winapi", - "xdg", -] - [[package]] name = "arbitrary" version = "1.4.1" @@ -163,17 +151,6 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -[[package]] -name = "async-recursion" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.100", -] - [[package]] name = "async-trait" version = "0.1.80" @@ -209,43 +186,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b99d887f4066f8a1b4a713a8121fab07ff543863ac86177ebdee6b5cb18acf12" dependencies = [ "cfg-if 1.0.0", - "derive_more 0.99.17", + "derive_more", "serde", "shrinkwraprs", ] -[[package]] -name = "aws-lc-rs" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b756939cb2f8dc900aa6dcd505e6e2428e9cae7ff7b028c49e3946efa70878" -dependencies = [ - "aws-lc-sys", - "zeroize", -] - -[[package]] -name = "aws-lc-sys" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f7720b74ed28ca77f90769a71fd8c637a0137f6fae4ae947e1050229cff57f" -dependencies = [ - "bindgen 0.69.5", - "cc", - "cmake", - "dunce", - "fs_extra", -] - -[[package]] -name = "backon" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "970d91570c01a8a5959b36ad7dd1c30642df24b6b3068710066f6809f7033bb7" -dependencies = [ - "fastrand", -] - [[package]] name = "backtrace" version = "0.3.72" @@ -273,61 +218,6 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64ct" -version = "1.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3" - -[[package]] -name = "bindgen" -version = "0.69.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" -dependencies = [ - "bitflags 2.6.0", - "cexpr", - "clang-sys", - "itertools 0.12.1", - "lazy_static", - "lazycell", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash 1.1.0", - "shlex", - "syn 2.0.100", - "which", -] - -[[package]] -name = "bindgen" -version = "0.71.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" -dependencies = [ - "bitflags 2.6.0", - "cexpr", - "clang-sys", - "itertools 0.13.0", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash 2.1.1", - "shlex", - "syn 2.0.100", -] - -[[package]] -name = "bit_field" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" - [[package]] name = "bitflags" version = "1.3.2" @@ -414,26 +304,9 @@ version = "1.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c" dependencies = [ - "jobserver", - "libc", "shlex", ] -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "0.1.10" @@ -461,17 +334,6 @@ dependencies = [ "windows-targets 0.52.5", ] -[[package]] -name = "clang-sys" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -dependencies = [ - "glob", - "libc", - "libloading", -] - [[package]] name = "clap" version = "2.34.0" @@ -527,15 +389,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" -[[package]] -name = "cmake" -version = "0.1.54" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" -dependencies = [ - "cc", -] - [[package]] name = "colorchoice" version = "1.0.1" @@ -552,22 +405,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] - -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - [[package]] name = "constant_time_eq" version = "0.3.0" @@ -589,16 +426,6 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "core-foundation" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -614,32 +441,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "cpp_build" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f8638c97fbd79cc6fc80b616e0e74b49bac21014faed590bbc89b7e2676c90" -dependencies = [ - "cc", - "cpp_common", - "lazy_static", - "proc-macro2", - "regex", - "syn 2.0.100", - "unicode-xid", -] - -[[package]] -name = "cpp_common" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25fcfea2ee05889597d35e986c2ad0169694320ae5cc8f6d2640a4bb8a884560" -dependencies = [ - "lazy_static", - "proc-macro2", - "syn 2.0.100", -] - [[package]] name = "cpufeatures" version = "0.2.12" @@ -658,17 +459,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "cron" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f8c3e73077b4b4a6ab1ea5047c37c57aee77657bc8ecd6f29b0af082d0b0c07" -dependencies = [ - "chrono", - "nom", - "once_cell", -] - [[package]] name = "crossbeam-channel" version = "0.5.13" @@ -704,33 +494,6 @@ dependencies = [ "syn 2.0.100", ] -[[package]] -name = "curve25519-dalek" -version = "4.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "curve25519-dalek-derive", - "digest", - "fiat-crypto", - "rustc_version", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.100", -] - [[package]] name = "darling" version = "0.20.9" @@ -785,49 +548,6 @@ dependencies = [ "parking_lot_core", ] -[[package]] -name = "data-encoding" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" - -[[package]] -name = "datachannel" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8266ddd85164e8187d47790ddcc0c693e60e9c2a5535d1bd2f87bff9cf7b611f" -dependencies = [ - "datachannel-sys", - "derive_more 2.0.1", - "parking_lot", - "serde", - "tracing", - "webrtc-sdp", -] - -[[package]] -name = "datachannel-sys" -version = "0.22.3+0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23490657978a0ead3f505ee7d82daa8d3494b87a40e48feb8f01df277e0bc7c7" -dependencies = [ - "bindgen 0.71.1", - "cmake", - "cpp_build", - "once_cell", - "openssl-src", -] - -[[package]] -name = "der" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" -dependencies = [ - "const-oid", - "zeroize", -] - [[package]] name = "deranged" version = "0.3.11" @@ -893,39 +613,12 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive_more" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" -dependencies = [ - "derive_more-impl", -] - -[[package]] -name = "derive_more-impl" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.100", - "unicode-xid", -] - [[package]] name = "diff" version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - [[package]] name = "digest" version = "0.10.7" @@ -947,12 +640,6 @@ dependencies = [ "syn 2.0.100", ] -[[package]] -name = "downcast" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" - [[package]] name = "dunce" version = "1.0.4" @@ -965,31 +652,6 @@ version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005" -[[package]] -name = "ed25519" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" -dependencies = [ - "pkcs8", - "signature", -] - -[[package]] -name = "ed25519-dalek" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" -dependencies = [ - "curve25519-dalek", - "ed25519", - "rand_core", - "serde", - "sha2", - "subtle", - "zeroize", -] - [[package]] name = "either" version = "1.12.0" @@ -1039,12 +701,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" -[[package]] -name = "fiat-crypto" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" - [[package]] name = "filetime" version = "0.2.23" @@ -1084,15 +740,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - [[package]] name = "fnv" version = "1.0.7" @@ -1114,18 +761,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fragile" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" - -[[package]] -name = "fs_extra" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" - [[package]] name = "futures" version = "0.3.30" @@ -1236,30 +871,12 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", ] -[[package]] -name = "getrandom" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "r-efi", - "wasi 0.14.2+wasi-0.2.4", -] - [[package]] name = "gimli" version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" -[[package]] -name = "glob" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" - [[package]] name = "hashbrown" version = "0.12.3" @@ -1367,14 +984,12 @@ checksum = "1c9c6d11afb2ca290e75cf1799898d5e734590591f90df5b9daa26aa66b69333" dependencies = [ "base64 0.22.1", "blake2b_simd", - "bytes", - "derive_more 0.99.17", + "derive_more", "fixt", "futures", "holochain_serialized_bytes", "holochain_util", "holochain_wasmer_common", - "kitsune2_api", "must_future", "rand", "rusqlite", @@ -1384,32 +999,6 @@ dependencies = [ "thiserror 1.0.61", ] -[[package]] -name = "holochain_chc" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c5aee4c9fbe0f3dd0327a69a438ba32830a2f26b3666a606d3a297ec4909c4b" -dependencies = [ - "async-trait", - "derive_more 0.99.17", - "futures", - "getrandom 0.2.15", - "holochain_keystore", - "holochain_nonce", - "holochain_serialized_bytes", - "holochain_types", - "must_future", - "one_err", - "parking_lot", - "reqwest", - "serde", - "serde_bytes", - "serde_json", - "thiserror 1.0.61", - "tracing", - "url", -] - [[package]] name = "holochain_integrity_types" version = "0.5.2" @@ -1436,7 +1025,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2a05366cbd926d065a4fb65293d44a3abddd19c0b926d5ec11d30dd9041d91f" dependencies = [ "base64 0.22.1", - "derive_more 0.99.17", + "derive_more", "futures", "holo_hash", "holochain_secure_primitive", @@ -1451,64 +1040,23 @@ dependencies = [ "schemars", "serde", "serde_bytes", - "shrinkwraprs", - "sodoken", - "thiserror 1.0.61", - "tokio", - "tracing", - "url2", -] - -[[package]] -name = "holochain_nonce" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d025b73143cee4eb2310eb5382c7946c4b2c955b9f49d71b56acb3265e5eeeb5" -dependencies = [ - "getrandom 0.2.15", - "holochain_secure_primitive", - "holochain_timestamp", -] - -[[package]] -name = "holochain_p2p" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c41aaac0a9d280c2eac6ffc40b9bd6e4f6e624467c8e9e198f043cdcfd802ec" -dependencies = [ - "async-trait", - "blake2b_simd", - "bytes", - "derive_more 0.99.17", - "fixt", - "futures", - "holo_hash", - "holochain_chc", - "holochain_keystore", - "holochain_nonce", - "holochain_serialized_bytes", - "holochain_sqlite", - "holochain_state", - "holochain_timestamp", - "holochain_trace", - "holochain_types", - "holochain_zome_types", - "kitsune2", - "kitsune2_api", - "kitsune2_core", - "kitsune2_gossip", - "lair_keystore_api", - "mockall", - "opentelemetry_api", - "parking_lot", - "rand", - "rmp-serde", - "serde", - "serde_json", + "shrinkwraprs", + "sodoken", "thiserror 1.0.61", "tokio", - "tokio-stream", "tracing", + "url2", +] + +[[package]] +name = "holochain_nonce" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d025b73143cee4eb2310eb5382c7946c4b2c955b9f49d71b56acb3265e5eeeb5" +dependencies = [ + "getrandom", + "holochain_secure_primitive", + "holochain_timestamp", ] [[package]] @@ -1557,10 +1105,10 @@ dependencies = [ "async-trait", "base64 0.22.1", "bytes", - "derive_more 0.99.17", + "derive_more", "fallible-iterator", "futures", - "getrandom 0.2.15", + "getrandom", "hc_r2d2_sqlite", "holo_hash", "holochain_nonce", @@ -1591,49 +1139,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "holochain_state" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705fff77ce09a0d58a98b470247ed6055206878f99d8fec3383cd2a2d832e7d8" -dependencies = [ - "async-recursion", - "chrono", - "cron", - "derive_more 0.99.17", - "fallible-iterator", - "holo_hash", - "holochain_chc", - "holochain_keystore", - "holochain_nonce", - "holochain_serialized_bytes", - "holochain_sqlite", - "holochain_state_types", - "holochain_types", - "holochain_zome_types", - "kitsune2_api", - "maplit", - "one_err", - "parking_lot", - "serde", - "serde_json", - "shrinkwraprs", - "thiserror 1.0.61", - "tokio", - "tracing", -] - -[[package]] -name = "holochain_state_types" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c9b4b8c587640321fcfc5c40cf40a2e7d8f498731866e2f5a1a7e692ee3915c" -dependencies = [ - "holo_hash", - "holochain_integrity_types", - "serde", -] - [[package]] name = "holochain_timestamp" version = "0.5.2" @@ -1652,7 +1157,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81c18eb741e8e78650ab12508b52ee5b060f4985a089234515cb0debadec3447" dependencies = [ "chrono", - "derive_more 0.99.17", + "derive_more", "inferno", "once_cell", "serde_json", @@ -1677,10 +1182,10 @@ dependencies = [ "cfg-if 0.1.10", "chrono", "derive_builder", - "derive_more 0.99.17", + "derive_more", "flate2", "futures", - "getrandom 0.2.15", + "getrandom", "holo_hash", "holochain_keystore", "holochain_nonce", @@ -1754,7 +1259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04a839ffe4e692986d3ac05ee1f6c9887f5f6c96bf78fe1bdff4bf4513129b7e" dependencies = [ "derive_builder", - "derive_more 0.99.17", + "derive_more", "holo_hash", "holochain_integrity_types", "holochain_nonce", @@ -1773,15 +1278,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "http" version = "1.1.0" @@ -1851,10 +1347,10 @@ dependencies = [ "http", "hyper", "hyper-util", - "rustls 0.22.4", + "rustls", "rustls-pki-types", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls", "tower-service", ] @@ -2091,15 +1587,6 @@ dependencies = [ "str_stack", ] -[[package]] -name = "influxive-otel-atomic-obs" -version = "0.0.4-alpha.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4de21a259dc1a3e8c8b8621632d5c9149489a774f9a82639057e890d197dd0a" -dependencies = [ - "opentelemetry_api", -] - [[package]] name = "ipnet" version = "2.9.0" @@ -2132,15 +1619,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.12.1" @@ -2165,38 +1643,6 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" -[[package]] -name = "jni" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" -dependencies = [ - "cesu8", - "cfg-if 1.0.0", - "combine", - "jni-sys", - "log", - "thiserror 1.0.61", - "walkdir", - "windows-sys 0.45.0", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jobserver" -version = "0.1.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" -dependencies = [ - "getrandom 0.3.2", - "libc", -] - [[package]] name = "js-sys" version = "0.3.69" @@ -2206,19 +1652,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "kitsune2" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da5867368fb4f7b15f66f990fc5d58f6f0070e2f3bc2a2210c0c6a82ebfa301" -dependencies = [ - "bytes", - "kitsune2_api", - "kitsune2_core", - "kitsune2_gossip", - "kitsune2_transport_tx5", -] - [[package]] name = "kitsune2_api" version = "0.1.8" @@ -2236,90 +1669,6 @@ dependencies = [ "url", ] -[[package]] -name = "kitsune2_bootstrap_client" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6068e3d97f7b21d7766ca0c265dfdcc49ee13fe1f966fed61c7f7f4203cfb8f" -dependencies = [ - "base64 0.22.1", - "kitsune2_api", - "tracing", - "ureq", - "url", -] - -[[package]] -name = "kitsune2_core" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8c0373a21a07f64b6c48d064300c66938eb6c99ab29a364a86c03b71649f2a2" -dependencies = [ - "backon", - "bytes", - "ed25519-dalek", - "futures", - "kitsune2_api", - "kitsune2_bootstrap_client", - "prost", - "rand", - "serde", - "serde_json", - "tokio", - "tracing", - "ureq", - "url", -] - -[[package]] -name = "kitsune2_dht" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee43a9497105ad48b25ebec479dd5f47518284e0ddd05886d54858cde8ab753" -dependencies = [ - "bytes", - "kitsune2_api", - "tracing", -] - -[[package]] -name = "kitsune2_gossip" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3ffef5e35d68d68d093b876eaa58adb8ba274c5be686b38fba23738444f674" -dependencies = [ - "backon", - "bytes", - "kitsune2_api", - "kitsune2_core", - "kitsune2_dht", - "prost", - "rand", - "serde", - "serde_json", - "thiserror 2.0.12", - "tokio", - "tracing", -] - -[[package]] -name = "kitsune2_transport_tx5" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5725a17faec4784616e7c76d371402ce9ea6ef1fb4d2e53927e6bcd2b93db41" -dependencies = [ - "base64 0.22.1", - "bytes", - "kitsune2_api", - "serde", - "serde_json", - "tokio", - "tracing", - "tx5", - "tx5-core", - "url", -] - [[package]] name = "lair_keystore" version = "0.6.1" @@ -2367,12 +1716,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "libc" version = "0.2.171" @@ -2447,7 +1790,6 @@ version = "0.500.0-rc.3" dependencies = [ "futures", "hex", - "holochain_p2p", "holochain_types", "lair_keystore_api", "nanoid", @@ -2512,12 +1854,6 @@ dependencies = [ "hashbrown 0.15.2", ] -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - [[package]] name = "matchers" version = "0.1.0" @@ -2571,40 +1907,13 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "mockall" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" -dependencies = [ - "cfg-if 1.0.0", - "downcast", - "fragile", - "lazy_static", - "mockall_derive", - "predicates", - "predicates-tree", -] - -[[package]] -name = "mockall_derive" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" -dependencies = [ - "cfg-if 1.0.0", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "mr_bundle" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c00e8d8de159c44524b1fcfd37abb5d2865e2b788137efb3ab359d4c4c5ce974" dependencies = [ - "derive_more 0.99.17", + "derive_more", "flate2", "futures", "holochain_util", @@ -2695,12 +2004,6 @@ dependencies = [ "libloading", ] -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - [[package]] name = "nom" version = "7.1.3" @@ -2711,12 +2014,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - [[package]] name = "ntapi" version = "0.4.1" @@ -2828,21 +2125,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-src" -version = "300.3.1+3.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" -dependencies = [ - "cc", -] - [[package]] name = "opentelemetry_api" version = "0.20.0" @@ -2941,16 +2223,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - [[package]] name = "pkg-config" version = "0.3.30" @@ -2969,36 +2241,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "predicates" -version = "2.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" -dependencies = [ - "difflib", - "float-cmp", - "itertools 0.10.5", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - [[package]] name = "pretty_assertions" version = "1.4.0" @@ -3009,16 +2251,6 @@ dependencies = [ "yansi", ] -[[package]] -name = "prettyplease" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" -dependencies = [ - "proc-macro2", - "syn 2.0.100", -] - [[package]] name = "proc-macro-crate" version = "3.1.0" @@ -3102,12 +2334,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "r-efi" -version = "5.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" - [[package]] name = "r2d2" version = "0.8.10" @@ -3146,7 +2372,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.15", + "getrandom", ] [[package]] @@ -3247,7 +2473,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.22.4", + "rustls", "rustls-pemfile", "rustls-pki-types", "serde", @@ -3255,7 +2481,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls", "tower-service", "url", "wasm-bindgen", @@ -3297,7 +2523,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if 1.0.0", - "getrandom 0.2.15", + "getrandom", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -3385,18 +2611,6 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc-hash" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" - [[package]] name = "rustc_version" version = "0.4.0" @@ -3428,39 +2642,11 @@ dependencies = [ "log", "ring 0.17.8", "rustls-pki-types", - "rustls-webpki 0.102.4", - "subtle", - "zeroize", -] - -[[package]] -name = "rustls" -version = "0.23.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c" -dependencies = [ - "aws-lc-rs", - "log", - "once_cell", - "ring 0.17.8", - "rustls-pki-types", - "rustls-webpki 0.103.1", + "rustls-webpki", "subtle", "zeroize", ] -[[package]] -name = "rustls-native-certs" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" -dependencies = [ - "openssl-probe", - "rustls-pki-types", - "schannel", - "security-framework", -] - [[package]] name = "rustls-pemfile" version = "2.1.2" @@ -3488,74 +2674,12 @@ dependencies = [ "untrusted 0.9.0", ] -[[package]] -name = "rustls-webpki" -version = "0.103.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03" -dependencies = [ - "aws-lc-rs", - "ring 0.17.8", - "rustls-pki-types", - "untrusted 0.9.0", -] - [[package]] name = "ryu" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "sbd-client" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1970bcf04f1a476f3f8d2188aaf51bca6197c0fa7072d7de0937d3cbc0a2eb6e" -dependencies = [ - "base64 0.22.1", - "ed25519-dalek", - "futures", - "rand", - "rustls 0.23.25", - "rustls-native-certs", - "tokio", - "tokio-rustls 0.26.2", - "tokio-tungstenite", - "tracing", - "webpki-roots", -] - -[[package]] -name = "sbd-e2e-crypto-client" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2999cae35e0c66bf71fd57490f4bd807a33cbb9b351a440c0833755e33fd9308" -dependencies = [ - "bytes", - "sbd-client", - "sodoken", - "tokio", - "tracing", -] - -[[package]] -name = "schannel" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "scheduled-thread-pool" version = "0.2.7" @@ -3595,29 +2719,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "security-framework" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" -dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "semver" version = "1.0.23" @@ -3762,17 +2863,6 @@ dependencies = [ "unsafe-libyaml", ] -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest", -] - [[package]] name = "sha2" version = "0.10.8" @@ -3821,15 +2911,6 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "rand_core", -] - [[package]] name = "simd-adler32" version = "0.3.7" @@ -3884,16 +2965,6 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - [[package]] name = "sqlformat" version = "0.2.6" @@ -4060,12 +3131,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - [[package]] name = "textwrap" version = "0.11.0" @@ -4212,45 +3277,9 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.22.4", - "rustls-pki-types", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" -dependencies = [ - "rustls 0.23.25", - "tokio", -] - -[[package]] -name = "tokio-stream" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" -dependencies = [ - "futures-util", - "log", - "rustls 0.23.25", + "rustls", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.2", - "tungstenite", ] [[package]] @@ -4406,92 +3435,6 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" -[[package]] -name = "tungstenite" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand", - "rustls 0.23.25", - "rustls-pki-types", - "sha1", - "thiserror 1.0.61", - "utf-8", -] - -[[package]] -name = "tx5" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243f2f2815e826b2c79e1cf10093f77afda339ef0e0dd4a2d619d57cbc4ef40a" -dependencies = [ - "base64 0.22.1", - "futures", - "influxive-otel-atomic-obs", - "serde", - "slab", - "tokio", - "tracing", - "tx5-connection", - "tx5-core", - "url", -] - -[[package]] -name = "tx5-connection" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4792c1810c269c5775fc4646f5f958fdb10b81fde97763244ef8d106f7bf49" -dependencies = [ - "bit_field", - "datachannel", - "futures", - "serde", - "serde_json", - "tokio", - "tracing", - "tx5-core", - "tx5-signal", -] - -[[package]] -name = "tx5-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad25f7c4aa26e6eec448eebb76aa7e845587c10a636e026919ff44a76cdcefbb" -dependencies = [ - "app_dirs2", - "base64 0.22.1", - "once_cell", - "rand", - "serde", - "serde_json", - "sha2", - "tempfile", - "tokio", - "tracing", -] - -[[package]] -name = "tx5-signal" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c213e14cadd6e0c8f70bbc34e7103b82c6453aa53493e2f8a39d17797d282f6f" -dependencies = [ - "rand", - "sbd-e2e-crypto-client", - "tokio", - "tracing", - "tx5-core", -] - [[package]] name = "typenum" version = "1.17.0" @@ -4516,12 +3459,6 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - [[package]] name = "unicode_categories" version = "0.1.1" @@ -4553,13 +3490,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d" dependencies = [ "base64 0.22.1", - "flate2", "log", "once_cell", - "rustls 0.23.25", - "rustls-pki-types", "url", - "webpki-roots", ] [[package]] @@ -4590,12 +3523,6 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - [[package]] name = "utf16_iter" version = "1.0.5" @@ -4620,7 +3547,7 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ - "getrandom 0.2.15", + "getrandom", "rand", ] @@ -4648,16 +3575,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - [[package]] name = "want" version = "0.3.1" @@ -4679,15 +3596,6 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "wasi" -version = "0.14.2+wasi-0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" -dependencies = [ - "wit-bindgen-rt", -] - [[package]] name = "wasm-bindgen" version = "0.2.92" @@ -4773,28 +3681,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "webrtc-sdp" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a87d58624aae43577604ea137de9dcaf92793eccc4d816efad482001c2e055ca" -dependencies = [ - "log", - "url", -] - -[[package]] -name = "which" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -dependencies = [ - "either", - "home", - "once_cell", - "rustix", -] - [[package]] name = "winapi" version = "0.3.9" @@ -4811,15 +3697,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -4888,15 +3765,6 @@ dependencies = [ "windows-targets 0.52.5", ] -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -4915,21 +3783,6 @@ dependencies = [ "windows-targets 0.52.5", ] -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-targets" version = "0.48.5" @@ -4961,12 +3814,6 @@ dependencies = [ "windows_x86_64_msvc 0.52.5", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -4979,12 +3826,6 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -4997,12 +3838,6 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -5021,12 +3856,6 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -5039,12 +3868,6 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -5057,12 +3880,6 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -5075,12 +3892,6 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -5121,15 +3932,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "wit-bindgen-rt" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" -dependencies = [ - "bitflags 2.6.0", -] - [[package]] name = "write16" version = "1.0.0" @@ -5153,12 +3955,6 @@ dependencies = [ "rustix", ] -[[package]] -name = "xdg" -version = "2.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" - [[package]] name = "yaml-rust" version = "0.4.5" diff --git a/Cargo.toml b/Cargo.toml index 25f2875..1b1abc0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,6 @@ napi = { version = "2.12.2", default-features = false, features = [ ] } napi-derive = "2.12.2" -holochain_p2p = "0.5.2" holochain_types = "0.5.2" lair_keystore_api = "0.6.1" From ea12692857ffb770f1d38aca9d310b8cee3516ba Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 12 May 2025 11:43:01 +0200 Subject: [PATCH 12/54] use --zig flag --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 87ef720..df5b7a6 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -59,8 +59,8 @@ jobs: # echo 'export PATH="/build/zig-linux-x86_64-0.13.0:$PATH"' >> ~/.bashrc # echo "zig version" # zig version - # yarn build --zig --target aarch64-unknown-linux-gnu - yarn build --target aarch64-unknown-linux-gnu + yarn build --zig --target aarch64-unknown-linux-gnu + # yarn build --target aarch64-unknown-linux-gnu # - host: ubuntu-latest # target: armv7-unknown-linux-gnueabihf # setup: | From cdb3d3bf8599d4990e7159d26d7ff6b6331f3b39 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 12 May 2025 11:54:11 +0200 Subject: [PATCH 13/54] add setup zig step --- .github/workflows/CI.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index df5b7a6..4be3bb4 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -108,6 +108,11 @@ jobs: # with: # version: 0.11.0 + - uses: mlugg/setup-zig@v2 + # if: ${{ matrix.settings.target == 'armv7-unknown-linux-gnueabihf' || matrix.settings.target == 'aarch64-unknown-linux-gnu' || matrix.settings.target == 'armv7-unknown-linux-musleabihf' }} + with: + version: 0.13.0 + - name: Setup toolchain run: ${{ matrix.settings.setup }} if: ${{ matrix.settings.setup }} From a258da4a8c8f20c8693ab771c6908cae1293dc51 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 12 May 2025 12:08:18 +0200 Subject: [PATCH 14/54] add logic to install zig in docker container --- .github/workflows/CI.yml | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4be3bb4..772532a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -49,16 +49,17 @@ jobs: target: aarch64-unknown-linux-gnu docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 build: | - # echo "fetching zig tar" - # curl --output zig-linux-aarch64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-aarch64-0.13.0.tar.xz - # echo "unzipping zig" - # tar xf zig-linux-aarch64-0.13.0.tar.xz - # pwd - # ls - # echo "exporting path" - # echo 'export PATH="/build/zig-linux-x86_64-0.13.0:$PATH"' >> ~/.bashrc - # echo "zig version" - # zig version + echo "fetching zig tar" + curl --output zig-linux-aarch64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-aarch64-0.13.0.tar.xz + echo "unzipping zig" + tar xf zig-linux-aarch64-0.13.0.tar.xz + pwd + ls + echo "exporting path" + echo 'export PATH="/build/zig-linux-x86_64-0.13.0:$PATH"' >> ~/.bashrc + source ~/.bashrc + echo "zig version" + zig version yarn build --zig --target aarch64-unknown-linux-gnu # yarn build --target aarch64-unknown-linux-gnu # - host: ubuntu-latest @@ -103,16 +104,6 @@ jobs: with: go-version: 'stable' - # - uses: goto-bus-stop/setup-zig@v2 - # if: ${{ matrix.settings.target == 'armv7-unknown-linux-gnueabihf' || matrix.settings.target == 'armv7-unknown-linux-musleabihf' }} - # with: - # version: 0.11.0 - - - uses: mlugg/setup-zig@v2 - # if: ${{ matrix.settings.target == 'armv7-unknown-linux-gnueabihf' || matrix.settings.target == 'aarch64-unknown-linux-gnu' || matrix.settings.target == 'armv7-unknown-linux-musleabihf' }} - with: - version: 0.13.0 - - name: Setup toolchain run: ${{ matrix.settings.setup }} if: ${{ matrix.settings.setup }} From 225d51555c0f2fc7ffee863efc64b22367ea1330 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 12 May 2025 12:14:32 +0200 Subject: [PATCH 15/54] use bash shell --- .github/workflows/CI.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 772532a..5ac4db0 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,6 +47,7 @@ jobs: # strip -x *.node - host: ubuntu-latest target: aarch64-unknown-linux-gnu + shell: bash docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 build: | echo "fetching zig tar" From b6a9d3d76a9c9a2755d1828834897757803ac1e6 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 12 May 2025 12:20:20 +0200 Subject: [PATCH 16/54] export --- .github/workflows/CI.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5ac4db0..53acc8a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,7 +47,6 @@ jobs: # strip -x *.node - host: ubuntu-latest target: aarch64-unknown-linux-gnu - shell: bash docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 build: | echo "fetching zig tar" @@ -57,8 +56,10 @@ jobs: pwd ls echo "exporting path" - echo 'export PATH="/build/zig-linux-x86_64-0.13.0:$PATH"' >> ~/.bashrc - source ~/.bashrc + export PATH=$PATH:/build/zig-linux-x86_64-0.13.0 + # export PATH=$PATH:/build/zig-linux-x86_64-0.13.0 + # echo 'export PATH=$PATH:/build/zig-linux-x86_64-0.13.0' >> ~/.bashrc + # source ~/.bashrc echo "zig version" zig version yarn build --zig --target aarch64-unknown-linux-gnu From cbeef86c00f3b8fcfb73f71d76d5895ad426c8e6 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 12 May 2025 12:27:41 +0200 Subject: [PATCH 17/54] fix path --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 53acc8a..388c165 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -56,9 +56,9 @@ jobs: pwd ls echo "exporting path" - export PATH=$PATH:/build/zig-linux-x86_64-0.13.0 + export PATH=$PATH:/build/zig-linux-aarch64-0.13.0 # export PATH=$PATH:/build/zig-linux-x86_64-0.13.0 - # echo 'export PATH=$PATH:/build/zig-linux-x86_64-0.13.0' >> ~/.bashrc + # echo 'export PATH=$PATH:/build/zig-linux-aarch64-0.13.0' >> ~/.bashrc # source ~/.bashrc echo "zig version" zig version From 81a5939f289df4cc8496b3c15f19e37c8f96ff34 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 12 May 2025 12:31:22 +0200 Subject: [PATCH 18/54] add uname --- .github/workflows/CI.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 388c165..43b17af 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -49,6 +49,7 @@ jobs: target: aarch64-unknown-linux-gnu docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 build: | + uname -a echo "fetching zig tar" curl --output zig-linux-aarch64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-aarch64-0.13.0.tar.xz echo "unzipping zig" From faec4ee5c20cd392089b24431aadded12fe54f22 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 12 May 2025 12:34:35 +0200 Subject: [PATCH 19/54] change to x86_64 zig --- .github/workflows/CI.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 43b17af..06e08bc 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -51,13 +51,13 @@ jobs: build: | uname -a echo "fetching zig tar" - curl --output zig-linux-aarch64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-aarch64-0.13.0.tar.xz + curl --output zig-linux-x86_64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz echo "unzipping zig" - tar xf zig-linux-aarch64-0.13.0.tar.xz + tar xf zig-linux-x86_64-0.13.0.tar.xz pwd ls echo "exporting path" - export PATH=$PATH:/build/zig-linux-aarch64-0.13.0 + export PATH=$PATH:/build/zig-linux-x86_64-0.13.0 # export PATH=$PATH:/build/zig-linux-x86_64-0.13.0 # echo 'export PATH=$PATH:/build/zig-linux-aarch64-0.13.0' >> ~/.bashrc # source ~/.bashrc From 6ebf0806796dc572bbd0e969e4bc208e346a9759 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 12 May 2025 12:58:08 +0200 Subject: [PATCH 20/54] added abi suffix --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 06e08bc..16f71e3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -64,7 +64,7 @@ jobs: echo "zig version" zig version yarn build --zig --target aarch64-unknown-linux-gnu - # yarn build --target aarch64-unknown-linux-gnu + # yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=2.17 # - host: ubuntu-latest # target: armv7-unknown-linux-gnueabihf # setup: | From c32a384020b382465e83516e4b37d2c7670dfd99 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 12 May 2025 13:01:22 +0200 Subject: [PATCH 21/54] change abi suffix --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 16f71e3..489cab4 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -64,7 +64,7 @@ jobs: echo "zig version" zig version yarn build --zig --target aarch64-unknown-linux-gnu - # yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=2.17 + # yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=gnu # - host: ubuntu-latest # target: armv7-unknown-linux-gnueabihf # setup: | From 6503e32aeb4e78d216dd680ae64fb2da3fe489f4 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 12 May 2025 13:07:51 +0200 Subject: [PATCH 22/54] remove zig --- .github/workflows/CI.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 489cab4..404e91a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -49,20 +49,20 @@ jobs: target: aarch64-unknown-linux-gnu docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 build: | - uname -a - echo "fetching zig tar" - curl --output zig-linux-x86_64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz - echo "unzipping zig" - tar xf zig-linux-x86_64-0.13.0.tar.xz - pwd - ls - echo "exporting path" - export PATH=$PATH:/build/zig-linux-x86_64-0.13.0 + # uname -a + # echo "fetching zig tar" + # curl --output zig-linux-x86_64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz + # echo "unzipping zig" + # tar xf zig-linux-x86_64-0.13.0.tar.xz + # pwd + # ls + # echo "exporting path" # export PATH=$PATH:/build/zig-linux-x86_64-0.13.0 - # echo 'export PATH=$PATH:/build/zig-linux-aarch64-0.13.0' >> ~/.bashrc - # source ~/.bashrc - echo "zig version" - zig version + # # export PATH=$PATH:/build/zig-linux-x86_64-0.13.0 + # # echo 'export PATH=$PATH:/build/zig-linux-aarch64-0.13.0' >> ~/.bashrc + # # source ~/.bashrc + # echo "zig version" + # zig version yarn build --zig --target aarch64-unknown-linux-gnu # yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=gnu # - host: ubuntu-latest From 173ef53c2ce6c8079adaab598a28d47d6d753fea Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 12 May 2025 13:21:23 +0200 Subject: [PATCH 23/54] download libsodium and add SODIUM_DIST_DIR variable --- .github/workflows/CI.yml | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 404e91a..166ab06 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -49,21 +49,28 @@ jobs: target: aarch64-unknown-linux-gnu docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 build: | - # uname -a - # echo "fetching zig tar" - # curl --output zig-linux-x86_64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz - # echo "unzipping zig" - # tar xf zig-linux-x86_64-0.13.0.tar.xz - # pwd - # ls - # echo "exporting path" + uname -a + echo "fetching zig tar" + curl --output zig-linux-x86_64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz + echo "unzipping zig" + tar xf zig-linux-x86_64-0.13.0.tar.xz + pwd + ls + echo "exporting path" + export PATH=$PATH:/build/zig-linux-x86_64-0.13.0 # export PATH=$PATH:/build/zig-linux-x86_64-0.13.0 - # # export PATH=$PATH:/build/zig-linux-x86_64-0.13.0 - # # echo 'export PATH=$PATH:/build/zig-linux-aarch64-0.13.0' >> ~/.bashrc - # # source ~/.bashrc - # echo "zig version" - # zig version - yarn build --zig --target aarch64-unknown-linux-gnu + # echo 'export PATH=$PATH:/build/zig-linux-aarch64-0.13.0' >> ~/.bashrc + # source ~/.bashrc + echo "zig version" + zig version + # Download libsodium + mkdir libsodium + curl -L --output ./libsodium/LATEST.tar.gz https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/LATEST.tar.gz + curl -L --output ./libsodium/LATEST.tar.gz.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/LATEST.tar.gz.minisig + curl -L --output ./libsodium/libsodium-1.0.19-stable.zip https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip + curl -L --output ./libsodium/libsodium-1.0.19-stable.zip.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip.minisig + + SODIUM_DIST_DIR="$(pwd)/libsodium yarn build --zig --target aarch64-unknown-linux-gnu # yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=gnu # - host: ubuntu-latest # target: armv7-unknown-linux-gnueabihf From 21c8cfbf877fc57a8b500036184ff02343f472a1 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 12 May 2025 13:25:24 +0200 Subject: [PATCH 24/54] fix env variable --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 166ab06..b08bffa 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -70,7 +70,7 @@ jobs: curl -L --output ./libsodium/libsodium-1.0.19-stable.zip https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip curl -L --output ./libsodium/libsodium-1.0.19-stable.zip.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip.minisig - SODIUM_DIST_DIR="$(pwd)/libsodium yarn build --zig --target aarch64-unknown-linux-gnu + SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --zig --target aarch64-unknown-linux-gnu # yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=gnu # - host: ubuntu-latest # target: armv7-unknown-linux-gnueabihf From 60eec086c04a28776d246b6bd838705843530aa6 Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 12 May 2025 13:35:49 +0200 Subject: [PATCH 25/54] change to SODIUM_LIB_DIR --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b08bffa..7109dcb 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -70,7 +70,7 @@ jobs: curl -L --output ./libsodium/libsodium-1.0.19-stable.zip https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip curl -L --output ./libsodium/libsodium-1.0.19-stable.zip.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip.minisig - SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --zig --target aarch64-unknown-linux-gnu + SODIUM_LIB_DIR="$(pwd)/libsodium" yarn build --zig --target aarch64-unknown-linux-gnu # yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=gnu # - host: ubuntu-latest # target: armv7-unknown-linux-gnueabihf From 4a8b16bb0bbe5877430a718c81bf51e6633338ab Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 12 May 2025 13:51:38 +0200 Subject: [PATCH 26/54] add --zig to package.json --- .github/workflows/CI.yml | 22 ++++++++++------------ package.json | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 7109dcb..5ae12a3 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -58,19 +58,17 @@ jobs: ls echo "exporting path" export PATH=$PATH:/build/zig-linux-x86_64-0.13.0 - # export PATH=$PATH:/build/zig-linux-x86_64-0.13.0 - # echo 'export PATH=$PATH:/build/zig-linux-aarch64-0.13.0' >> ~/.bashrc - # source ~/.bashrc - echo "zig version" - zig version - # Download libsodium - mkdir libsodium - curl -L --output ./libsodium/LATEST.tar.gz https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/LATEST.tar.gz - curl -L --output ./libsodium/LATEST.tar.gz.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/LATEST.tar.gz.minisig - curl -L --output ./libsodium/libsodium-1.0.19-stable.zip https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip - curl -L --output ./libsodium/libsodium-1.0.19-stable.zip.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip.minisig + # echo "zig version" + # zig version + # # Download libsodium + # mkdir libsodium + # curl -L --output ./libsodium/LATEST.tar.gz https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/LATEST.tar.gz + # curl -L --output ./libsodium/LATEST.tar.gz.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/LATEST.tar.gz.minisig + # curl -L --output ./libsodium/libsodium-1.0.19-stable.zip https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip + # curl -L --output ./libsodium/libsodium-1.0.19-stable.zip.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip.minisig - SODIUM_LIB_DIR="$(pwd)/libsodium" yarn build --zig --target aarch64-unknown-linux-gnu + yarn build --target aarch64-unknown-linux-gnu + # SODIUM_LIB_DIR="$(pwd)/libsodium" yarn build --zig --target aarch64-unknown-linux-gnu # yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=gnu # - host: ubuntu-latest # target: armv7-unknown-linux-gnueabihf diff --git a/package.json b/package.json index cd60a02..005272b 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ }, "scripts": { "artifacts": "napi artifacts", - "build": "napi build --platform --release --cargo-flags=\"--locked\"", + "build": "napi build --platform --release --cargo-flags=\"--locked\" --zig", "build:debug": "napi build --platform", "prepublishOnly": "napi prepublish -t npm", "test": "ava", From 4eff20768825df9cfcfa32e827e5e7acdf1a9a7f Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 19:51:10 +0200 Subject: [PATCH 27/54] add step to print config.log --- .github/workflows/CI.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5ae12a3..0d4a290 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -58,6 +58,17 @@ jobs: ls echo "exporting path" export PATH=$PATH:/build/zig-linux-x86_64-0.13.0 + + # echo "installing cross-compilation tools" + # sudo apt-get update + # sudo apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu + + # echo "setting env vars" + # export CC_aarch64_unknown_linux_gnu=clang + # export CFLAGS_aarch64_unknown_linux_gnu="--target=aarch64-unknown-linux-gnu --sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot" + + + # echo "zig version" # zig version # # Download libsodium @@ -70,6 +81,10 @@ jobs: yarn build --target aarch64-unknown-linux-gnu # SODIUM_LIB_DIR="$(pwd)/libsodium" yarn build --zig --target aarch64-unknown-linux-gnu # yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=gnu + + echo "printing config.log" + cat config.log + # - host: ubuntu-latest # target: armv7-unknown-linux-gnueabihf # setup: | From 41220d6feb189b6b78abc43891f2d327c96a6a4c Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 19:54:37 +0200 Subject: [PATCH 28/54] build outside docker --- .github/workflows/CI.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0d4a290..af027cc 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,7 +47,7 @@ jobs: # strip -x *.node - host: ubuntu-latest target: aarch64-unknown-linux-gnu - docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 + # docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 build: | uname -a echo "fetching zig tar" @@ -72,14 +72,14 @@ jobs: # echo "zig version" # zig version # # Download libsodium - # mkdir libsodium - # curl -L --output ./libsodium/LATEST.tar.gz https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/LATEST.tar.gz - # curl -L --output ./libsodium/LATEST.tar.gz.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/LATEST.tar.gz.minisig - # curl -L --output ./libsodium/libsodium-1.0.19-stable.zip https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip - # curl -L --output ./libsodium/libsodium-1.0.19-stable.zip.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip.minisig + mkdir libsodium + curl -L --output ./libsodium/LATEST.tar.gz https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/LATEST.tar.gz + curl -L --output ./libsodium/LATEST.tar.gz.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/LATEST.tar.gz.minisig + curl -L --output ./libsodium/libsodium-1.0.19-stable.zip https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip + curl -L --output ./libsodium/libsodium-1.0.19-stable.zip.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip.minisig yarn build --target aarch64-unknown-linux-gnu - # SODIUM_LIB_DIR="$(pwd)/libsodium" yarn build --zig --target aarch64-unknown-linux-gnu + SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --zig --target aarch64-unknown-linux-gnu # yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=gnu echo "printing config.log" From 68f86feb6aea85cb20efa36eb0f966d412c1ca7e Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 19:57:02 +0200 Subject: [PATCH 29/54] remove --zig flag --- .github/workflows/CI.yml | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index af027cc..e020b0d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -79,7 +79,8 @@ jobs: curl -L --output ./libsodium/libsodium-1.0.19-stable.zip.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip.minisig yarn build --target aarch64-unknown-linux-gnu - SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --zig --target aarch64-unknown-linux-gnu + SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --target aarch64-unknown-linux-gnu + # SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --zig --target aarch64-unknown-linux-gnu # yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=gnu echo "printing config.log" diff --git a/package.json b/package.json index 005272b..cd60a02 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ }, "scripts": { "artifacts": "napi artifacts", - "build": "napi build --platform --release --cargo-flags=\"--locked\" --zig", + "build": "napi build --platform --release --cargo-flags=\"--locked\"", "build:debug": "napi build --platform", "prepublishOnly": "napi prepublish -t npm", "test": "ava", From 62f8dbe7e6c74144a052051174061522bf4540ff Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 20:01:33 +0200 Subject: [PATCH 30/54] change zig path export --- .github/workflows/CI.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e020b0d..0ddd202 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -57,7 +57,7 @@ jobs: pwd ls echo "exporting path" - export PATH=$PATH:/build/zig-linux-x86_64-0.13.0 + export PATH=$PATH:$(pwd)/zig-linux-x86_64-0.13.0 # echo "installing cross-compilation tools" # sudo apt-get update @@ -69,8 +69,8 @@ jobs: - # echo "zig version" - # zig version + echo "zig version" + zig version # # Download libsodium mkdir libsodium curl -L --output ./libsodium/LATEST.tar.gz https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/LATEST.tar.gz From 078c97c0e5d3a923ddd8950dfaa5d4f4b020fc7c Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 20:03:08 +0200 Subject: [PATCH 31/54] add --zig flag --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 0ddd202..7545c84 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -79,8 +79,8 @@ jobs: curl -L --output ./libsodium/libsodium-1.0.19-stable.zip.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip.minisig yarn build --target aarch64-unknown-linux-gnu - SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --target aarch64-unknown-linux-gnu - # SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --zig --target aarch64-unknown-linux-gnu + # SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --target aarch64-unknown-linux-gnu + SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --zig --target aarch64-unknown-linux-gnu # yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=gnu echo "printing config.log" From b9c02e4cbc03b2d69238a0f46e8684a4eb95772d Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 20:06:26 +0200 Subject: [PATCH 32/54] back inside docker --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 7545c84..e4d9795 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,7 +47,7 @@ jobs: # strip -x *.node - host: ubuntu-latest target: aarch64-unknown-linux-gnu - # docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 + docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 build: | uname -a echo "fetching zig tar" From 06bdebc48600061c98f49ac10801e17889269fa7 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 20:10:04 +0200 Subject: [PATCH 33/54] add --zig to build command --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cd60a02..005272b 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ }, "scripts": { "artifacts": "napi artifacts", - "build": "napi build --platform --release --cargo-flags=\"--locked\"", + "build": "napi build --platform --release --cargo-flags=\"--locked\" --zig", "build:debug": "napi build --platform", "prepublishOnly": "napi prepublish -t npm", "test": "ava", From 1feeeebe7b0a35aa4a58c53bf88bcb4a0a6bab7c Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 20:12:51 +0200 Subject: [PATCH 34/54] change to SODIUM_LIB_DIR --- .github/workflows/CI.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e4d9795..158690d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -80,12 +80,9 @@ jobs: yarn build --target aarch64-unknown-linux-gnu # SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --target aarch64-unknown-linux-gnu - SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --zig --target aarch64-unknown-linux-gnu + SODIUM_LIB_DIR="$(pwd)/libsodium" yarn build --zig --target aarch64-unknown-linux-gnu # yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=gnu - echo "printing config.log" - cat config.log - # - host: ubuntu-latest # target: armv7-unknown-linux-gnueabihf # setup: | From 76bde7c95ee6dfc1683b21b8bd7441842bc50a42 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 20:25:44 +0200 Subject: [PATCH 35/54] no docker --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 158690d..5df2a6e 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,7 +47,7 @@ jobs: # strip -x *.node - host: ubuntu-latest target: aarch64-unknown-linux-gnu - docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 + # docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 build: | uname -a echo "fetching zig tar" @@ -80,7 +80,7 @@ jobs: yarn build --target aarch64-unknown-linux-gnu # SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --target aarch64-unknown-linux-gnu - SODIUM_LIB_DIR="$(pwd)/libsodium" yarn build --zig --target aarch64-unknown-linux-gnu + SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --zig --target aarch64-unknown-linux-gnu # yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=gnu # - host: ubuntu-latest From 04e78ff6a70e877a19a8d522dcc739d3e9d99468 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 20:29:41 +0200 Subject: [PATCH 36/54] comment out wrong command --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5df2a6e..1097b4b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -78,7 +78,7 @@ jobs: curl -L --output ./libsodium/libsodium-1.0.19-stable.zip https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip curl -L --output ./libsodium/libsodium-1.0.19-stable.zip.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip.minisig - yarn build --target aarch64-unknown-linux-gnu + # yarn build --target aarch64-unknown-linux-gnu # SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --target aarch64-unknown-linux-gnu SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --zig --target aarch64-unknown-linux-gnu # yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=gnu From 72f599f516e47d9cf439e06f769313a4f0b0b7e7 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 20:34:59 +0200 Subject: [PATCH 37/54] add docker --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 1097b4b..ad6728c 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,7 +47,7 @@ jobs: # strip -x *.node - host: ubuntu-latest target: aarch64-unknown-linux-gnu - # docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 + docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 build: | uname -a echo "fetching zig tar" From f92199aebdcdd72097c69bd7ac575abe83cf307b Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 20:41:29 +0200 Subject: [PATCH 38/54] change to aarch64 zig --- .github/workflows/CI.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ad6728c..e186bdd 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -51,13 +51,17 @@ jobs: build: | uname -a echo "fetching zig tar" - curl --output zig-linux-x86_64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz + # curl --output zig-linux-x86_64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz + curl --output zig-linux-aarch64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-aarch64-0.13.0.tar.xz echo "unzipping zig" - tar xf zig-linux-x86_64-0.13.0.tar.xz + # tar xf zig-linux-x86_64-0.13.0.tar.xz + tar xf zig-linux-aarch64-0.13.0.tar.xz pwd ls echo "exporting path" - export PATH=$PATH:$(pwd)/zig-linux-x86_64-0.13.0 + # export PATH=$PATH:$(pwd)/zig-linux-x86_64-0.13.0 + export PATH=$PATH:$(pwd)/zig-linux-aarch64-0.13.0 + # echo "installing cross-compilation tools" # sudo apt-get update From 920e82cfaca5a3c0884725404e2e4239986672de Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 20:43:33 +0200 Subject: [PATCH 39/54] no docker --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e186bdd..22593e2 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,7 +47,7 @@ jobs: # strip -x *.node - host: ubuntu-latest target: aarch64-unknown-linux-gnu - docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 + # docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 build: | uname -a echo "fetching zig tar" From 0e6f6ff1d9be2d20952912a83da3d349054c5335 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 20:46:07 +0200 Subject: [PATCH 40/54] add linker env arg --- .github/workflows/CI.yml | 19 ++++++++----------- package.json | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 22593e2..5c0bcb9 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -50,17 +50,14 @@ jobs: # docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 build: | uname -a - echo "fetching zig tar" + # echo "fetching zig tar" # curl --output zig-linux-x86_64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz - curl --output zig-linux-aarch64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-aarch64-0.13.0.tar.xz - echo "unzipping zig" + # echo "unzipping zig" # tar xf zig-linux-x86_64-0.13.0.tar.xz - tar xf zig-linux-aarch64-0.13.0.tar.xz - pwd - ls - echo "exporting path" + # pwd + # ls + # echo "exporting path" # export PATH=$PATH:$(pwd)/zig-linux-x86_64-0.13.0 - export PATH=$PATH:$(pwd)/zig-linux-aarch64-0.13.0 # echo "installing cross-compilation tools" @@ -73,8 +70,8 @@ jobs: - echo "zig version" - zig version + # echo "zig version" + # zig version # # Download libsodium mkdir libsodium curl -L --output ./libsodium/LATEST.tar.gz https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/LATEST.tar.gz @@ -82,9 +79,9 @@ jobs: curl -L --output ./libsodium/libsodium-1.0.19-stable.zip https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip curl -L --output ./libsodium/libsodium-1.0.19-stable.zip.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip.minisig + CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --target aarch64-unknown-linux-gnu # yarn build --target aarch64-unknown-linux-gnu # SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --target aarch64-unknown-linux-gnu - SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --zig --target aarch64-unknown-linux-gnu # yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=gnu # - host: ubuntu-latest diff --git a/package.json b/package.json index 005272b..cd60a02 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ }, "scripts": { "artifacts": "napi artifacts", - "build": "napi build --platform --release --cargo-flags=\"--locked\" --zig", + "build": "napi build --platform --release --cargo-flags=\"--locked\"", "build:debug": "napi build --platform", "prepublishOnly": "napi prepublish -t npm", "test": "ava", From 72053d61df1a7602185e8374abfc9b3fb5ac8d1a Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 20:49:59 +0200 Subject: [PATCH 41/54] install gcc --- .github/workflows/CI.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5c0bcb9..3da9721 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -68,6 +68,11 @@ jobs: # export CC_aarch64_unknown_linux_gnu=clang # export CFLAGS_aarch64_unknown_linux_gnu="--target=aarch64-unknown-linux-gnu --sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot" + echo "installing gcc for aarch64" + sudo apt update + sudo apt install gcc-aarch64-linux-gnu + + aarch64-linux-gnu-gcc --version # echo "zig version" From d9069fb0e0c4ba448442e361334bec3e76e0813f Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 20:56:37 +0200 Subject: [PATCH 42/54] add binding test --- .github/workflows/CI.yml | 80 ++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3da9721..eae9f36 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -248,46 +248,46 @@ jobs: - name: Test bindings run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-slim yarn test - # test-linux-aarch64-gnu-binding: - # name: Test bindings on aarch64-unknown-linux-gnu - node@${{ matrix.node }} - # needs: - # - build - # strategy: - # fail-fast: false - # matrix: - # node: - # - '18' - # - '20' - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v4 - # - name: Download artifacts - # uses: actions/download-artifact@v4 - # with: - # name: bindings-aarch64-unknown-linux-gnu - # path: . - # - name: List packages - # run: ls -R . - # shell: bash - # - name: Install dependencies - # run: | - # yarn config set supportedArchitectures.cpu "arm64" - # yarn config set supportedArchitectures.libc "glibc" - # yarn install - # - name: Set up QEMU - # uses: docker/setup-qemu-action@v3 - # with: - # platforms: arm64 - # - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - # - name: Setup and run tests - # uses: addnab/docker-run-action@v3 - # with: - # image: node:${{ matrix.node }}-slim - # options: '--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build' - # run: | - # set -e - # yarn test - # ls -la + test-linux-aarch64-gnu-binding: + name: Test bindings on aarch64-unknown-linux-gnu - node@${{ matrix.node }} + needs: + - build + strategy: + fail-fast: false + matrix: + node: + - '18' + - '20' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Download artifacts + uses: actions/download-artifact@v4 + with: + name: bindings-aarch64-unknown-linux-gnu + path: . + - name: List packages + run: ls -R . + shell: bash + - name: Install dependencies + run: | + yarn config set supportedArchitectures.cpu "arm64" + yarn config set supportedArchitectures.libc "glibc" + yarn install + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + with: + platforms: arm64 + - run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + - name: Setup and run tests + uses: addnab/docker-run-action@v3 + with: + image: node:${{ matrix.node }}-slim + options: '--platform linux/arm64 -v ${{ github.workspace }}:/build -w /build' + run: | + set -e + yarn test + ls -la # test-linux-arm-gnueabihf-binding: # name: Test bindings on armv7-unknown-linux-gnueabihf - node@${{ matrix.node }} From 3bfa4906262099980ffb1b09f91769d8a7a6eb3b Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 21:02:01 +0200 Subject: [PATCH 43/54] without dist dir --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index eae9f36..8df9a13 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -85,8 +85,8 @@ jobs: curl -L --output ./libsodium/libsodium-1.0.19-stable.zip.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip.minisig CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --target aarch64-unknown-linux-gnu - # yarn build --target aarch64-unknown-linux-gnu - # SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --target aarch64-unknown-linux-gnu + yarn build --target aarch64-unknown-linux-gnu + # # SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --target aarch64-unknown-linux-gnu # yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=gnu # - host: ubuntu-latest From 9dda2349dd259b26c6df64abc14b50b7e95b2d9d Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 21:08:37 +0200 Subject: [PATCH 44/54] back to normal --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 8df9a13..eae9f36 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -85,8 +85,8 @@ jobs: curl -L --output ./libsodium/libsodium-1.0.19-stable.zip.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip.minisig CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --target aarch64-unknown-linux-gnu - yarn build --target aarch64-unknown-linux-gnu - # # SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --target aarch64-unknown-linux-gnu + # yarn build --target aarch64-unknown-linux-gnu + # SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --target aarch64-unknown-linux-gnu # yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=gnu # - host: ubuntu-latest From 7665659be6b54fdc45d539048db29b7f850b8335 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 21:11:04 +0200 Subject: [PATCH 45/54] cleanup --- .github/workflows/CI.yml | 65 ++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 42 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index eae9f36..ec38666 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -26,58 +26,42 @@ jobs: fail-fast: false matrix: settings: - # - host: macos-latest - # target: x86_64-apple-darwin - # build: | - # yarn build --target x86_64-apple-darwin - # strip -x *.node - # - host: windows-latest - # build: yarn build - # target: x86_64-pc-windows-msvc - # - host: ubuntu-22.04 - # target: x86_64-unknown-linux-gnu - # build: |- - # set -e && - # yarn build --target x86_64-unknown-linux-gnu && - # strip *.node - # - host: macos-latest - # target: aarch64-apple-darwin - # build: | - # yarn build --target aarch64-apple-darwin - # strip -x *.node + - host: macos-latest + target: x86_64-apple-darwin + build: | + yarn build --target x86_64-apple-darwin + strip -x *.node + - host: windows-latest + build: yarn build + target: x86_64-pc-windows-msvc + - host: ubuntu-22.04 + target: x86_64-unknown-linux-gnu + build: |- + set -e && + yarn build --target x86_64-unknown-linux-gnu && + strip *.node + - host: macos-latest + target: aarch64-apple-darwin + build: | + yarn build --target aarch64-apple-darwin + strip -x *.node - host: ubuntu-latest target: aarch64-unknown-linux-gnu # docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 build: | - uname -a - # echo "fetching zig tar" + # We don't actually need zig currently # curl --output zig-linux-x86_64-0.13.0.tar.xz https://ziglang.org/download/0.13.0/zig-linux-x86_64-0.13.0.tar.xz - # echo "unzipping zig" # tar xf zig-linux-x86_64-0.13.0.tar.xz - # pwd - # ls - # echo "exporting path" # export PATH=$PATH:$(pwd)/zig-linux-x86_64-0.13.0 + # zig version - - # echo "installing cross-compilation tools" - # sudo apt-get update - # sudo apt-get install gcc-aarch64-linux-gnu g++-aarch64-linux-gnu - - # echo "setting env vars" - # export CC_aarch64_unknown_linux_gnu=clang - # export CFLAGS_aarch64_unknown_linux_gnu="--target=aarch64-unknown-linux-gnu --sysroot=/usr/aarch64-unknown-linux-gnu/aarch64-unknown-linux-gnu/sysroot" - - echo "installing gcc for aarch64" + # install gcc compiler for aarch64 sudo apt update sudo apt install gcc-aarch64-linux-gnu aarch64-linux-gnu-gcc --version - - # echo "zig version" - # zig version - # # Download libsodium + # Download libsodium mkdir libsodium curl -L --output ./libsodium/LATEST.tar.gz https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/LATEST.tar.gz curl -L --output ./libsodium/LATEST.tar.gz.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/LATEST.tar.gz.minisig @@ -85,9 +69,6 @@ jobs: curl -L --output ./libsodium/libsodium-1.0.19-stable.zip.minisig https://github.com/matthme/holochain-binaries/releases/download/libsodium-releases/libsodium-1.0.19-stable.zip.minisig CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --target aarch64-unknown-linux-gnu - # yarn build --target aarch64-unknown-linux-gnu - # SODIUM_DIST_DIR="$(pwd)/libsodium" yarn build --target aarch64-unknown-linux-gnu - # yarn build --target aarch64-unknown-linux-gnu --zig-abi-suffix=gnu # - host: ubuntu-latest # target: armv7-unknown-linux-gnueabihf From 5d7a964d5b2ee6cde240d210c7633ee17c29d85e Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 21:17:38 +0200 Subject: [PATCH 46/54] remove branch --- .github/workflows/CI.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ec38666..06fcc42 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -10,7 +10,6 @@ permissions: push: branches: - main - - feat/aarch64 tags-ignore: - '**' paths-ignore: From e2ec1a2090a5eef379a05a1918e5e15015957d04 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 21:32:16 +0200 Subject: [PATCH 47/54] add npm folder for aarch64 --- .github/workflows/CI.yml | 170 ++++++++++++++++--------------- npm/linux-arm64-gnu/README.md | 3 + npm/linux-arm64-gnu/package.json | 25 +++++ 3 files changed, 114 insertions(+), 84 deletions(-) create mode 100644 npm/linux-arm64-gnu/README.md create mode 100644 npm/linux-arm64-gnu/package.json diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 06fcc42..f568246 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -10,6 +10,8 @@ permissions: push: branches: - main + pull_request: + - main tags-ignore: - '**' paths-ignore: @@ -25,25 +27,25 @@ jobs: fail-fast: false matrix: settings: - - host: macos-latest - target: x86_64-apple-darwin - build: | - yarn build --target x86_64-apple-darwin - strip -x *.node - - host: windows-latest - build: yarn build - target: x86_64-pc-windows-msvc - - host: ubuntu-22.04 - target: x86_64-unknown-linux-gnu - build: |- - set -e && - yarn build --target x86_64-unknown-linux-gnu && - strip *.node - - host: macos-latest - target: aarch64-apple-darwin - build: | - yarn build --target aarch64-apple-darwin - strip -x *.node + # - host: macos-latest + # target: x86_64-apple-darwin + # build: | + # yarn build --target x86_64-apple-darwin + # strip -x *.node + # - host: windows-latest + # build: yarn build + # target: x86_64-pc-windows-msvc + # - host: ubuntu-22.04 + # target: x86_64-unknown-linux-gnu + # build: |- + # set -e && + # yarn build --target x86_64-unknown-linux-gnu && + # strip *.node + # - host: macos-latest + # target: aarch64-apple-darwin + # build: | + # yarn build --target aarch64-apple-darwin + # strip -x *.node - host: ubuntu-latest target: aarch64-unknown-linux-gnu # docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 @@ -161,72 +163,72 @@ jobs: path: ${{ env.APP_NAME }}.*.node if-no-files-found: error - test-macOS-windows-binding: - name: Test bindings on ${{ matrix.settings.target }} - node@${{ matrix.node }} - needs: - - build - strategy: - fail-fast: false - matrix: - settings: - - host: macos-latest - target: x86_64-apple-darwin - - host: windows-latest - target: x86_64-pc-windows-msvc - node: - - '18' - - '20' - runs-on: ${{ matrix.settings.host }} - steps: - - uses: actions/checkout@v4 - - name: Setup node - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node }} - cache: yarn - - name: Install dependencies - run: yarn install - - name: Download artifacts - uses: actions/download-artifact@v4 - with: - name: bindings-${{ matrix.settings.target }} - path: . - - name: List packages - run: ls -R . - shell: bash - - name: Test bindings - run: yarn test + # test-macOS-windows-binding: + # name: Test bindings on ${{ matrix.settings.target }} - node@${{ matrix.node }} + # needs: + # - build + # strategy: + # fail-fast: false + # matrix: + # settings: + # - host: macos-latest + # target: x86_64-apple-darwin + # - host: windows-latest + # target: x86_64-pc-windows-msvc + # node: + # - '18' + # - '20' + # runs-on: ${{ matrix.settings.host }} + # steps: + # - uses: actions/checkout@v4 + # - name: Setup node + # uses: actions/setup-node@v4 + # with: + # node-version: ${{ matrix.node }} + # cache: yarn + # - name: Install dependencies + # run: yarn install + # - name: Download artifacts + # uses: actions/download-artifact@v4 + # with: + # name: bindings-${{ matrix.settings.target }} + # path: . + # - name: List packages + # run: ls -R . + # shell: bash + # - name: Test bindings + # run: yarn test - test-linux-x64-gnu-binding: - name: Test bindings on Linux-x64-gnu - node@${{ matrix.node }} - needs: - - build - strategy: - fail-fast: false - matrix: - node: - - '18' - - '20' - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4 - - name: Setup node - uses: actions/setup-node@v4 - with: - node-version: ${{ matrix.node }} - cache: yarn - - name: Install dependencies - run: yarn install - - name: Download artifacts - uses: actions/download-artifact@v4 - with: - name: bindings-x86_64-unknown-linux-gnu - path: . - - name: List packages - run: ls -R . - shell: bash - - name: Test bindings - run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-slim yarn test + # test-linux-x64-gnu-binding: + # name: Test bindings on Linux-x64-gnu - node@${{ matrix.node }} + # needs: + # - build + # strategy: + # fail-fast: false + # matrix: + # node: + # - '18' + # - '20' + # runs-on: ubuntu-22.04 + # steps: + # - uses: actions/checkout@v4 + # - name: Setup node + # uses: actions/setup-node@v4 + # with: + # node-version: ${{ matrix.node }} + # cache: yarn + # - name: Install dependencies + # run: yarn install + # - name: Download artifacts + # uses: actions/download-artifact@v4 + # with: + # name: bindings-x86_64-unknown-linux-gnu + # path: . + # - name: List packages + # run: ls -R . + # shell: bash + # - name: Test bindings + # run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-slim yarn test test-linux-aarch64-gnu-binding: name: Test bindings on aarch64-unknown-linux-gnu - node@${{ matrix.node }} diff --git a/npm/linux-arm64-gnu/README.md b/npm/linux-arm64-gnu/README.md new file mode 100644 index 0000000..5c316b1 --- /dev/null +++ b/npm/linux-arm64-gnu/README.md @@ -0,0 +1,3 @@ +# `@lightningrodlabs/we-rust-utils-linux-arm64-gnu` + +This is the **aarch64-unknown-linux-gnu** binary for `@lightningrodlabs/we-rust-utils` diff --git a/npm/linux-arm64-gnu/package.json b/npm/linux-arm64-gnu/package.json new file mode 100644 index 0000000..92ae6b4 --- /dev/null +++ b/npm/linux-arm64-gnu/package.json @@ -0,0 +1,25 @@ +{ + "name": "@lightningrodlabs/we-rust-utils-linux-arm64-gnu", + "version": "0.500.0-rc.3", + "repository": { + "type": "git", + "url": "https://github.com/lightningrodlabs/we-rust-utils" + }, + "os": [ + "linux" + ], + "cpu": [ + "arm64" + ], + "main": "we-rust-utils.linux-arm64-gnu.node", + "files": [ + "we-rust-utilss.linux-arm64-gnu.node" + ], + "license": "MIT", + "engines": { + "node": ">= 10" + }, + "libc": [ + "glibc" + ] +} \ No newline at end of file From b280ce2eb928bfbaf9a1da5f8dbb1221e08901fa Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 21:34:10 +0200 Subject: [PATCH 48/54] temporarily remove test depdendency --- .github/workflows/CI.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index f568246..092cbfe 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -315,8 +315,9 @@ jobs: name: Publish runs-on: ubuntu-22.04 needs: - - test-macOS-windows-binding - - test-linux-x64-gnu-binding + # - test-macOS-windows-binding + # - test-linux-x64-gnu-binding + - test-linux-aarch64-gnu-binding steps: - uses: actions/checkout@v4 - name: Setup node From 0e8ada6866fe1fb7b7aad0a090dbe959a4d6e48a Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 21:36:43 +0200 Subject: [PATCH 49/54] change order --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 092cbfe..4a2a158 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -315,9 +315,9 @@ jobs: name: Publish runs-on: ubuntu-22.04 needs: + - test-linux-aarch64-gnu-binding # - test-macOS-windows-binding # - test-linux-x64-gnu-binding - - test-linux-aarch64-gnu-binding steps: - uses: actions/checkout@v4 - name: Setup node From 60a8064f7a6186083a787e547909ccbc93e91d8d Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 21:38:51 +0200 Subject: [PATCH 50/54] add push --- .github/workflows/CI.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4a2a158..a4ca5c4 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -10,6 +10,7 @@ permissions: push: branches: - main + - feat/aarch64 pull_request: - main tags-ignore: From fb0a9a01acbac9ffa35c242e765dc335b7b656db Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 21:45:02 +0200 Subject: [PATCH 51/54] add triple to package.json --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index cd60a02..0be0e23 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,8 @@ "name": "we-rust-utils", "triples": { "additional": [ - "aarch64-apple-darwin" + "aarch64-apple-darwin", + "aarch64-unknown-linux-gnu" ] } }, From 55162d73eeedaab103d26e03bba4b78caeecf064 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 21:50:45 +0200 Subject: [PATCH 52/54] cleanup again --- .github/workflows/CI.yml | 175 ++++++++++++++++++++------------------- 1 file changed, 88 insertions(+), 87 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index a4ca5c4..571caba 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -10,7 +10,6 @@ permissions: push: branches: - main - - feat/aarch64 pull_request: - main tags-ignore: @@ -28,25 +27,25 @@ jobs: fail-fast: false matrix: settings: - # - host: macos-latest - # target: x86_64-apple-darwin - # build: | - # yarn build --target x86_64-apple-darwin - # strip -x *.node - # - host: windows-latest - # build: yarn build - # target: x86_64-pc-windows-msvc - # - host: ubuntu-22.04 - # target: x86_64-unknown-linux-gnu - # build: |- - # set -e && - # yarn build --target x86_64-unknown-linux-gnu && - # strip *.node - # - host: macos-latest - # target: aarch64-apple-darwin - # build: | - # yarn build --target aarch64-apple-darwin - # strip -x *.node + - host: macos-latest + target: x86_64-apple-darwin + build: | + yarn build --target x86_64-apple-darwin + strip -x *.node + - host: windows-latest + build: yarn build + target: x86_64-pc-windows-msvc + - host: ubuntu-22.04 + target: x86_64-unknown-linux-gnu + build: |- + set -e && + yarn build --target x86_64-unknown-linux-gnu && + strip *.node + - host: macos-latest + target: aarch64-apple-darwin + build: | + yarn build --target aarch64-apple-darwin + strip -x *.node - host: ubuntu-latest target: aarch64-unknown-linux-gnu # docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 @@ -164,72 +163,72 @@ jobs: path: ${{ env.APP_NAME }}.*.node if-no-files-found: error - # test-macOS-windows-binding: - # name: Test bindings on ${{ matrix.settings.target }} - node@${{ matrix.node }} - # needs: - # - build - # strategy: - # fail-fast: false - # matrix: - # settings: - # - host: macos-latest - # target: x86_64-apple-darwin - # - host: windows-latest - # target: x86_64-pc-windows-msvc - # node: - # - '18' - # - '20' - # runs-on: ${{ matrix.settings.host }} - # steps: - # - uses: actions/checkout@v4 - # - name: Setup node - # uses: actions/setup-node@v4 - # with: - # node-version: ${{ matrix.node }} - # cache: yarn - # - name: Install dependencies - # run: yarn install - # - name: Download artifacts - # uses: actions/download-artifact@v4 - # with: - # name: bindings-${{ matrix.settings.target }} - # path: . - # - name: List packages - # run: ls -R . - # shell: bash - # - name: Test bindings - # run: yarn test + test-macOS-windows-binding: + name: Test bindings on ${{ matrix.settings.target }} - node@${{ matrix.node }} + needs: + - build + strategy: + fail-fast: false + matrix: + settings: + - host: macos-latest + target: x86_64-apple-darwin + - host: windows-latest + target: x86_64-pc-windows-msvc + node: + - '18' + - '20' + runs-on: ${{ matrix.settings.host }} + steps: + - uses: actions/checkout@v4 + - name: Setup node + uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node }} + cache: yarn + - name: Install dependencies + run: yarn install + - name: Download artifacts + uses: actions/download-artifact@v4 + with: + name: bindings-${{ matrix.settings.target }} + path: . + - name: List packages + run: ls -R . + shell: bash + - name: Test bindings + run: yarn test - # test-linux-x64-gnu-binding: - # name: Test bindings on Linux-x64-gnu - node@${{ matrix.node }} - # needs: - # - build - # strategy: - # fail-fast: false - # matrix: - # node: - # - '18' - # - '20' - # runs-on: ubuntu-22.04 - # steps: - # - uses: actions/checkout@v4 - # - name: Setup node - # uses: actions/setup-node@v4 - # with: - # node-version: ${{ matrix.node }} - # cache: yarn - # - name: Install dependencies - # run: yarn install - # - name: Download artifacts - # uses: actions/download-artifact@v4 - # with: - # name: bindings-x86_64-unknown-linux-gnu - # path: . - # - name: List packages - # run: ls -R . - # shell: bash - # - name: Test bindings - # run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-slim yarn test + test-linux-x64-gnu-binding: + name: Test bindings on Linux-x64-gnu - node@${{ matrix.node }} + needs: + - build + strategy: + fail-fast: false + matrix: + node: + - '18' + - '20' + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v4 + - name: Setup node + uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node }} + cache: yarn + - name: Install dependencies + run: yarn install + - name: Download artifacts + uses: actions/download-artifact@v4 + with: + name: bindings-x86_64-unknown-linux-gnu + path: . + - name: List packages + run: ls -R . + shell: bash + - name: Test bindings + run: docker run --rm -v $(pwd):/build -w /build node:${{ matrix.node }}-slim yarn test test-linux-aarch64-gnu-binding: name: Test bindings on aarch64-unknown-linux-gnu - node@${{ matrix.node }} @@ -272,6 +271,8 @@ jobs: yarn test ls -la + # Adding this will also require adding an npm folder and adding the target triple to the + # root package.json: https://github.com/napi-rs/napi-rs/issues/1545 # test-linux-arm-gnueabihf-binding: # name: Test bindings on armv7-unknown-linux-gnueabihf - node@${{ matrix.node }} # needs: @@ -316,9 +317,9 @@ jobs: name: Publish runs-on: ubuntu-22.04 needs: + - test-macOS-windows-binding + - test-linux-x64-gnu-binding - test-linux-aarch64-gnu-binding - # - test-macOS-windows-binding - # - test-linux-x64-gnu-binding steps: - uses: actions/checkout@v4 - name: Setup node From bbb99459402a230a8ff0bf75a0fa48e453245458 Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 21:52:34 +0200 Subject: [PATCH 53/54] change to on push --- .github/workflows/CI.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 571caba..b130d45 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -10,8 +10,7 @@ permissions: push: branches: - main - pull_request: - - main + - feat/aarch64 tags-ignore: - '**' paths-ignore: From 49fb1d57d875ffa7f43ca6627d03b00232f3942f Mon Sep 17 00:00:00 2001 From: Matthias Date: Tue, 17 Jun 2025 22:09:52 +0200 Subject: [PATCH 54/54] remove push rule --- .github/workflows/CI.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b130d45..39b440d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -10,7 +10,6 @@ permissions: push: branches: - main - - feat/aarch64 tags-ignore: - '**' paths-ignore: