From 87e58c732b0c2f10445d25c8ead83b64467bacfe Mon Sep 17 00:00:00 2001 From: Sasha Gofman Date: Fri, 21 Jun 2024 13:15:47 +0100 Subject: [PATCH] fix release ci/cd (#5) --- .github/workflows/release.yml | 5 +- Cargo.lock | 116 +--------------------------------- Cargo.toml | 4 +- build.rs | 22 ------- 4 files changed, 8 insertions(+), 139 deletions(-) delete mode 100644 build.rs diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0e0fcc6..1cc2a01 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,8 +39,8 @@ jobs: platform: linux - runner: macos-13-xl platform: darwin - # - runner: macos-13-xl - # platform: darwin-aarch64 + - runner: macos-13-xl + platform: darwin-aarch64 runs-on: ${{ matrix.runner }} env: @@ -130,4 +130,5 @@ jobs: - uses: actions/upload-artifact@v4 with: + name: mamorurs-cli-${{ matrix.os }}-${{ matrix.version }} path: ./bin/**/mamorurs-cli diff --git a/Cargo.lock b/Cargo.lock index a40eef6..71b209e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2206,21 +2206,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -2755,25 +2740,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "h2" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http 1.1.0", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "half" version = "2.4.1" @@ -2959,7 +2925,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.26", + "h2", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -2982,7 +2948,6 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.5", "http 1.1.0", "http-body 1.0.0", "httparse", @@ -3036,22 +3001,6 @@ dependencies = [ "tokio-io-timeout", ] -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper 1.3.1", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - [[package]] name = "hyper-util" version = "0.1.5" @@ -3919,23 +3868,6 @@ dependencies = [ "rand", ] -[[package]] -name = "native-tls" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - [[package]] name = "nix" version = "0.26.4" @@ -4146,32 +4078,6 @@ dependencies = [ "pathdiff", ] -[[package]] -name = "openssl" -version = "0.10.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" -dependencies = [ - "bitflags 2.5.0", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.65", -] - [[package]] name = "openssl-probe" version = "0.1.5" @@ -4869,7 +4775,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.3.26", + "h2", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.28", @@ -4907,23 +4813,19 @@ checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ "base64 0.22.1", "bytes", - "encoding_rs", "futures-channel", "futures-core", "futures-util", - "h2 0.4.5", "http 1.1.0", "http-body 1.0.0", "http-body-util", "hyper 1.3.1", "hyper-rustls 0.26.0", - "hyper-tls", "hyper-util", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -4934,9 +4836,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper", - "system-configuration", "tokio", - "tokio-native-tls", "tokio-rustls 0.25.0", "tower-service", "url", @@ -6043,16 +5943,6 @@ dependencies = [ "syn 2.0.65", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.24.1" @@ -6167,7 +6057,7 @@ dependencies = [ "flate2", "futures-core", "futures-util", - "h2 0.3.26", + "h2", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.28", diff --git a/Cargo.toml b/Cargo.toml index f8fcf20..9ef4523 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,10 +8,10 @@ clap = { version = "4.5.4", features = ["derive", "env", "cargo"] } cosmrs = { git = "https://github.com/Mamoru-Foundation/cosmos-rust.git", rev = "6761b0874b0bb73a01d6fecddf90ecb58abc7b03" } url = "2.5.0" base64 = "0.22.1" -tonic = { version = "0.9", features = ["tls-roots", "gzip", "tls"] } +tonic = { version = "0.9",default-features = false, features = ["tls-roots", "tls", "gzip"] } tokio = { version = "1.38.0", features = ["full"] } dirs = "5.0.1" -reqwest = { version = "0.12", features = ["json", "blocking", "rustls-tls"] } +reqwest = { version = "0.12", default-features = false, features = ["json", "blocking", "rustls-tls"] } mamoru-chain-client = {git = "ssh://git@github.com/Mamoru-Foundation/mamoru-core.git", rev = "7b6d4612cb8fc452eb87dd00f54104b1095c3f64"} #mamoru-chain-client = { path = "../mamoru-core/chain-client"} cred-store = { path = "cred-store" } diff --git a/build.rs b/build.rs deleted file mode 100644 index d4eb7f6..0000000 --- a/build.rs +++ /dev/null @@ -1,22 +0,0 @@ -// static SERVICES: &[&str] = &[ -// "./proto/mamoru-chain/proto/validationchain/validationchain/tx.proto", -// "./proto/mamoru-chain/proto/validationchain/validationchain/query.proto", -// ]; - -// static INCLUDES: &[&str] = &["./proto/mamoru-chain/proto/", "./proto/"]; - -// fn main() -> Result<(), Box> { -// let builder = tonic_build::configure() -// .build_server(false) -// .build_client(true) -// .extern_path(".cosmos", "::cosmrs::proto::cosmos") -// .include_file("includes.rs"); - -// builder.compile(SERVICES, INCLUDES)?; - -// Ok(()) -// } - -fn main() -> Result<(), Box> { - Ok(()) -}