From 6e5fe95486faf1dfac7a9660b86391e9e5d2f6f9 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Wed, 9 Sep 2020 09:39:41 -0400 Subject: [PATCH] set version in jenkins --- set_version.sh | 7 +++++++ src/lib.rs | 1 + src/main.rs | 3 ++- src/version.rs | 7 +++++++ 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100755 set_version.sh create mode 100644 src/version.rs diff --git a/set_version.sh b/set_version.sh new file mode 100755 index 0000000..6a0e961 --- /dev/null +++ b/set_version.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +if [[ -z "${BUILD_NUMBER}" ]] ; then + echo "No BUILD_NUMBER environment variable was set" + exit 1 +fi +sed -i "s/.DEV_BUILD/.${BUILD_NUMBER}/" src/version.rs diff --git a/src/lib.rs b/src/lib.rs index 5bba8ca..be51342 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,6 +5,7 @@ * For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ */ +pub mod version; pub mod util; pub mod hyper_util; pub mod pass; diff --git a/src/main.rs b/src/main.rs index 6191410..d725106 100644 --- a/src/main.rs +++ b/src/main.rs @@ -34,6 +34,7 @@ use bubble_flexrouter::proxy::start_proxy; use bubble_flexrouter::util::read_required_env_var_argument; use bubble_flexrouter::util::read_required_env_var_argument_as_file; use bubble_flexrouter::util::read_path_to_string; +use bubble_flexrouter::version::VERSION; const MIN_TOKEN_CHARS: usize = 50; const MAX_TOKEN_CHARS: usize = 100; @@ -41,7 +42,7 @@ const MAX_TOKEN_CHARS: usize = 100; #[tokio::main] async fn main() { let args : ArgMatches = App::new("bubble-flexrouter") - .version("0.1.0") + .version(VERSION) .author("Jonathan Cobb ") .about("Proxy services for Bubble nodes") .arg(Arg::with_name("dns1") diff --git a/src/version.rs b/src/version.rs new file mode 100644 index 0000000..7af57b1 --- /dev/null +++ b/src/version.rs @@ -0,0 +1,7 @@ +#![deny(warnings)] +/** + * Copyright (c) 2020 Bubble, Inc. All rights reserved. + * For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/ + */ + +pub const VERSION: &'static str = "1.0.0.DEV_BUILD";