From f6f4c50811f7cd647b7a0d77457e4bf06044702a Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Mon, 30 Nov 2020 23:20:58 -0700 Subject: [PATCH 1/2] 0.2.6 --- appmgr/src/main.rs | 2 ++ appmgr/src/version/mod.rs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/appmgr/src/main.rs b/appmgr/src/main.rs index 41226d7b6..94f7bea73 100644 --- a/appmgr/src/main.rs +++ b/appmgr/src/main.rs @@ -37,6 +37,8 @@ async fn inner_main() -> Result<(), Error> { let version = format!("{}", crate::version::Current::new().semver()); let git_version = git_version::git_version!(args = ["--always", "--abbrev=40", "--dirty=-modified"]); + #[cfg(not(feature = "production"))] + let git_version = format!("{}-dev", git_version); #[allow(unused_mut)] let mut app = App::new("Start9 Application Manager") .version(version.as_str()) diff --git a/appmgr/src/version/mod.rs b/appmgr/src/version/mod.rs index ced9e8e61..abe170a79 100644 --- a/appmgr/src/version/mod.rs +++ b/appmgr/src/version/mod.rs @@ -22,7 +22,7 @@ mod v0_2_4; mod v0_2_5; mod v0_2_6; -pub use v0_2_5::Version as Current; +pub use v0_2_6::Version as Current; #[derive(serde::Serialize, serde::Deserialize)] #[serde(untagged)] From ba0b5a534940d7d295809de0b61787d4aa2ba32e Mon Sep 17 00:00:00 2001 From: Keagan McClelland Date: Tue, 1 Dec 2020 13:56:36 -0700 Subject: [PATCH 2/2] fixes agent build process in Makefile --- Makefile | 6 +++++- agent/build.sh | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dc3a22f4e..cb52ca61a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ APPMGR_SRC := $(shell find appmgr/src) appmgr/Cargo.toml appmgr/Cargo.lock +AGENT_SRC := $(shell find agent/src) $(shell find agent/config) agent/stack.yaml agent/package.yaml agent/build.sh .DELETE_ON_ERROR: @@ -19,4 +20,7 @@ product_key: appmgr/target/armv7-unknown-linux-musleabihf/release/appmgr: $(APPMGR_SRC) docker run --rm -it -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/appmgr:/home/rust/src start9/rust-arm-cross:latest cargo build --release --features=production - docker run --rm -it -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/appmgr:/home/rust/src start9/rust-arm-cross:latest arm-linux-gnueabi-strip target/armv7-unknown-linux-gnueabihf/release/appmgr \ No newline at end of file + docker run --rm -it -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/appmgr:/home/rust/src start9/rust-arm-cross:latest arm-linux-gnueabi-strip target/armv7-unknown-linux-gnueabihf/release/appmgr + +agent: $(AGENT_SRC) + (cd agent; ./build.sh) diff --git a/agent/build.sh b/agent/build.sh index 82cd44b54..b26b724e9 100755 --- a/agent/build.sh +++ b/agent/build.sh @@ -4,4 +4,3 @@ cat config/settings.yml | grep app-mgr-version-spec cat package.yaml | grep version stack --local-bin-path ./executables build --copy-bins #--flag start9-agent:disable-auth -upx ./executables/agent