From 861d658405e3fecbe49d59fd64654611d90e5998 Mon Sep 17 00:00:00 2001 From: "sijie.sun" Date: Sun, 13 Oct 2024 12:16:42 +0800 Subject: [PATCH] bump version to 2.0.3 --- .github/workflows/release.yml | 2 +- Cargo.lock | 4 ++-- easytier-gui/package.json | 2 +- easytier-gui/src-tauri/Cargo.toml | 2 +- easytier-gui/src-tauri/tauri.conf.json | 2 +- easytier/Cargo.toml | 2 +- easytier/src/easytier-cli.rs | 4 ++-- easytier/src/easytier-core.rs | 7 ++++--- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2f20ee6..49d5753 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ on: version: description: 'Version for this release' type: string - default: 'v2.0.2' + default: 'v2.0.3' required: true make_latest: description: 'Mark this release as latest' diff --git a/Cargo.lock b/Cargo.lock index 9a0d45d..0986cad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1539,7 +1539,7 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "easytier" -version = "2.0.2" +version = "2.0.3" dependencies = [ "aes-gcm", "anyhow", @@ -1631,7 +1631,7 @@ dependencies = [ [[package]] name = "easytier-gui" -version = "2.0.2" +version = "2.0.3" dependencies = [ "anyhow", "chrono", diff --git a/easytier-gui/package.json b/easytier-gui/package.json index 07c7f23..161c215 100644 --- a/easytier-gui/package.json +++ b/easytier-gui/package.json @@ -1,7 +1,7 @@ { "name": "easytier-gui", "type": "module", - "version": "2.0.2", + "version": "2.0.3", "private": true, "scripts": { "dev": "vite", diff --git a/easytier-gui/src-tauri/Cargo.toml b/easytier-gui/src-tauri/Cargo.toml index 70527aa..fcde608 100644 --- a/easytier-gui/src-tauri/Cargo.toml +++ b/easytier-gui/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "easytier-gui" -version = "2.0.2" +version = "2.0.3" description = "EasyTier GUI" authors = ["you"] edition = "2021" diff --git a/easytier-gui/src-tauri/tauri.conf.json b/easytier-gui/src-tauri/tauri.conf.json index 1e7c623..d0e6409 100644 --- a/easytier-gui/src-tauri/tauri.conf.json +++ b/easytier-gui/src-tauri/tauri.conf.json @@ -17,7 +17,7 @@ "createUpdaterArtifacts": false }, "productName": "easytier-gui", - "version": "2.0.2", + "version": "2.0.3", "identifier": "com.kkrainbow.easytier", "plugins": {}, "app": { diff --git a/easytier/Cargo.toml b/easytier/Cargo.toml index b700f21..20a7b7f 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/EasyTier/EasyTier" repository = "https://github.com/EasyTier/EasyTier" -version = "2.0.2" +version = "2.0.3" edition = "2021" authors = ["kkrainbow"] keywords = ["vpn", "p2p", "network", "easytier"] diff --git a/easytier/src/easytier-cli.rs b/easytier/src/easytier-cli.rs index 783b57c..f68e1e5 100644 --- a/easytier/src/easytier-cli.rs +++ b/easytier/src/easytier-cli.rs @@ -4,7 +4,7 @@ use std::{net::SocketAddr, sync::Mutex, time::Duration, vec}; use anyhow::{Context, Ok}; use clap::{command, Args, Parser, Subcommand}; -use common::stun::StunInfoCollectorTrait; +use common::{constants::EASYTIER_VERSION, stun::StunInfoCollectorTrait}; use proto::{ common::NatType, peer_rpc::{GetGlobalPeerMapRequest, PeerCenterRpc, PeerCenterRpcClientFactory}, @@ -30,7 +30,7 @@ use humansize::format_size; use tabled::settings::Style; #[derive(Parser, Debug)] -#[command(name = "easytier-cli", author, version, about, long_about = None)] +#[command(name = "easytier-cli", author, version = EASYTIER_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 4c80e1c..9f033f4 100644 --- a/easytier/src/easytier-core.rs +++ b/easytier/src/easytier-core.rs @@ -26,8 +26,9 @@ mod tunnel; mod utils; mod vpn_portal; -use common::config::{ - ConsoleLoggerConfig, FileLoggerConfig, NetworkIdentity, PeerConfig, VpnPortalConfig, +use common::{ + config::{ConsoleLoggerConfig, FileLoggerConfig, NetworkIdentity, PeerConfig, VpnPortalConfig}, + constants::EASYTIER_VERSION, }; use instance::instance::Instance; use tokio::net::TcpSocket; @@ -49,7 +50,7 @@ use mimalloc_rust::*; static GLOBAL_MIMALLOC: GlobalMiMalloc = GlobalMiMalloc; #[derive(Parser, Debug)] -#[command(name = "easytier-core", author, version, about, long_about = None)] +#[command(name = "easytier-core", author, version = EASYTIER_VERSION , about, long_about = None)] struct Cli { #[arg( short,