From f4d317bb02f7915e5def9853df1fda1d3127721d Mon Sep 17 00:00:00 2001 From: xi xiao Date: Fri, 17 Jan 2025 09:56:14 +0200 Subject: [PATCH 1/2] feat: show the version info in afmt -h --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/args.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4e6988a5..c701e7b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = 4 [[package]] name = "afmt" -version = "0.1.1" +version = "0.2.0" dependencies = [ "clap", "log", diff --git a/Cargo.toml b/Cargo.toml index cca9cb8c..7ef34152 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "afmt" -version = "0.1.1" +version = "0.2.0" edition = "2021" description = "An Salesforce Apex lang formatter" license = "MIT OR Apache-2.0" diff --git a/src/args.rs b/src/args.rs index d73c3fdf..555e8be6 100644 --- a/src/args.rs +++ b/src/args.rs @@ -8,7 +8,7 @@ pub struct Args { } pub fn get_args() -> Args { - const VERSION: &str = "v0.1.1"; + const VERSION: &str = "v0.2.0"; let matches = Command::new("afmt") .version(VERSION) From b9f0a2f963485c8b379a9f3eaacf7c859a8714a1 Mon Sep 17 00:00:00 2001 From: xi xiao Date: Fri, 17 Jan 2025 15:22:29 +0200 Subject: [PATCH 2/2] feat: streamline release-please, clpa and CLI to use Cargo.toml version info --- .github/workflows/release-please-main.yml | 2 +- src/args.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-please-main.yml b/.github/workflows/release-please-main.yml index 33178fbb..307e8722 100644 --- a/.github/workflows/release-please-main.yml +++ b/.github/workflows/release-please-main.yml @@ -17,4 +17,4 @@ jobs: - uses: googleapis/release-please-action@v4 with: token: ${{ secrets.PAT_AFMT }} - release-type: simple + release-type: rust # Use the rust release type for Cargo.toml handling diff --git a/src/args.rs b/src/args.rs index 555e8be6..6e85558c 100644 --- a/src/args.rs +++ b/src/args.rs @@ -8,11 +8,11 @@ pub struct Args { } pub fn get_args() -> Args { - const VERSION: &str = "v0.2.0"; + let version = env!("CARGO_PKG_VERSION"); // read from Cargo.toml in compiling time let matches = Command::new("afmt") - .version(VERSION) - .about(format!("Apex format tool (afmt): {}", VERSION)) + .version(version) + .about(format!("Apex format tool (afmt): {}", version)) .arg_required_else_help(true) .arg( ClapArg::new("file")