From 8e841bf5b52a89443c35b225d768d24a48519490 Mon Sep 17 00:00:00 2001 From: Yumin Wu Date: Thu, 9 May 2024 15:02:28 +0800 Subject: [PATCH 1/6] fixed version --- Cargo.lock | 2 +- easytier/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 91b2dfa..68b4c42 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -387,7 +387,7 @@ dependencies = [ [[package]] name = "boringtun" version = "0.6.0" -source = "git+https://github.com/EasyTier/boringtun.git#449204c3eca736dc23b075d81426527a357e2f2a" +source = "git+https://github.com/EasyTier/boringtun.git?rev=449204c#449204c3eca736dc23b075d81426527a357e2f2a" dependencies = [ "aead", "atomic-shim", diff --git a/easytier/Cargo.toml b/easytier/Cargo.toml index e78fca7..3dc0d3a 100644 --- a/easytier/Cargo.toml +++ b/easytier/Cargo.toml @@ -127,7 +127,7 @@ network-interface = "1.1.1" pathfinding = "4.9.1" # for encryption -boringtun = { git = "https://github.com/EasyTier/boringtun.git", optional = true } +boringtun = { git = "https://github.com/EasyTier/boringtun.git", optional = true, rev = "449204c" } ring = { version = "0.17", optional = true } bitflags = "2.5" aes-gcm = { version = "0.10.3", optional = true } From e4146c3f92f7cbb97f85b51887e87c0c6df07342 Mon Sep 17 00:00:00 2001 From: Yumin Wu Date: Thu, 9 May 2024 15:04:27 +0800 Subject: [PATCH 2/6] release reduce size --- Cargo.toml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index bd1ae95..6bf512d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,4 +7,8 @@ default-members = [ "easytier" ] panic = "unwind" [profile.release] -panic = "unwind" +lto = true +codegen-units = 1 +panic = "abort" +strip = true +opt-level = "z" From 770ab4a01b907a2af28312ad5e68a6f060811086 Mon Sep 17 00:00:00 2001 From: Yumin Wu Date: Thu, 9 May 2024 15:06:32 +0800 Subject: [PATCH 3/6] command friendly tips --- easytier/src/easytier-cli.rs | 2 +- easytier/src/easytier-core.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/easytier/src/easytier-cli.rs b/easytier/src/easytier-cli.rs index 33c53a8..c78e269 100644 --- a/easytier/src/easytier-cli.rs +++ b/easytier/src/easytier-cli.rs @@ -25,7 +25,7 @@ use humansize::format_size; use tabled::settings::Style; #[derive(Parser, Debug)] -#[command(author, version, about, long_about = None)] +#[command(name = "easytier-cli", author, version, about, long_about = None)] struct Cli { /// the instance name #[arg(short = 'p', long, default_value = "127.0.0.1:15888")] diff --git a/easytier/src/easytier-core.rs b/easytier/src/easytier-core.rs index 3860664..e367f32 100644 --- a/easytier/src/easytier-core.rs +++ b/easytier/src/easytier-core.rs @@ -41,7 +41,7 @@ use mimalloc_rust::*; static GLOBAL_MIMALLOC: GlobalMiMalloc = GlobalMiMalloc; #[derive(Parser, Debug)] -#[command(author, version, about, long_about = None)] +#[command(name = "easytier-core", author, version, about, long_about = None)] struct Cli { #[arg( short, From 469187d0bb9b1c09b8d645c266ac10fa9bd36934 Mon Sep 17 00:00:00 2001 From: Yumin Wu Date: Thu, 9 May 2024 15:20:49 +0800 Subject: [PATCH 4/6] temporary version(v1.0.0 is already published) --- Cargo.lock | 2 +- easytier/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 68b4c42..cd0657b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1266,7 +1266,7 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "easytier" -version = "1.0.0" +version = "1.0.1-pre" dependencies = [ "aes-gcm", "anyhow", diff --git a/easytier/Cargo.toml b/easytier/Cargo.toml index 3dc0d3a..938ffc3 100644 --- a/easytier/Cargo.toml +++ b/easytier/Cargo.toml @@ -3,7 +3,7 @@ name = "easytier" description = "A full meshed p2p VPN, connecting all your devices in one network with one command." homepage = "https://github.com/KKRainbow/EasyTier" repository = "https://github.com/KKRainbow/EasyTier" -version = "1.0.0" +version = "1.0.1-pre" edition = "2021" authors = ["kkrainbow"] keywords = ["vpn", "p2p", "network", "easytier"] From b1f8c5c1759969b78cecacfeb5735b3b0c3443b5 Mon Sep 17 00:00:00 2001 From: Yumin Wu Date: Thu, 9 May 2024 17:18:20 +0800 Subject: [PATCH 5/6] update release profile --- Cargo.toml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6bf512d..0e2e920 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,8 +7,9 @@ default-members = [ "easytier" ] panic = "unwind" [profile.release] -lto = true -codegen-units = 1 -panic = "abort" -strip = true -opt-level = "z" +panic = "unwind" +# panic = "abort" +# lto = true +# codegen-units = 1 +# strip = true +# opt-level = "z" From b4ebe7a4812f5b56454c67d1ec8ff75431ff91fa Mon Sep 17 00:00:00 2001 From: Yumin Wu Date: Thu, 9 May 2024 17:56:00 +0800 Subject: [PATCH 6/6] update .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index fb2d30c..9a7f190 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,6 @@ nohup.out components.d.ts musl_gcc + +# log +easytier-panic.log