Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 12:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #73 from Start9Labs/release/0.2.6

Browse Source 
Release/0.2.6
This commit is contained in:
Keagan McClelland
2020-12-01 13:58:33 -07:00
committed by GitHub
parent 1b937fb92e 6fa414c620
commit efdc93d698
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -1,4 +1,5 @@
APPMGR_SRC := $(shell find appmgr/src) appmgr/Cargo.toml appmgr/Cargo.lock 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: .DELETE_ON_ERROR:
@@ -19,4 +20,7 @@ product_key:
appmgr/target/armv7-unknown-linux-musleabihf/release/appmgr: $(APPMGR_SRC) 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 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 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)

1
agent/build.sh
View File

@@ -4,4 +4,3 @@ cat config/settings.yml | grep app-mgr-version-spec
cat package.yaml | grep version cat package.yaml | grep version
stack --local-bin-path ./executables build --copy-bins #--flag start9-agent:disable-auth stack --local-bin-path ./executables build --copy-bins #--flag start9-agent:disable-auth
upx ./executables/agent

2
appmgr/src/main.rs
View File

@@ -37,6 +37,8 @@ async fn inner_main() -> Result<(), Error> {
let version = format!("{}", crate::version::Current::new().semver()); let version = format!("{}", crate::version::Current::new().semver());
let git_version = let git_version =
git_version::git_version!(args = ["--always", "--abbrev=40", "--dirty=-modified"]); git_version::git_version!(args = ["--always", "--abbrev=40", "--dirty=-modified"]);
#[cfg(not(feature = "production"))]
let git_version = format!("{}-dev", git_version);
#[allow(unused_mut)] #[allow(unused_mut)]
let mut app = App::new("Start9 Application Manager") let mut app = App::new("Start9 Application Manager")
.version(version.as_str()) .version(version.as_str())

2
appmgr/src/version/mod.rs
View File

@@ -22,7 +22,7 @@ mod v0_2_4;
mod v0_2_5; mod v0_2_5;
mod v0_2_6; 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)] #[derive(serde::Serialize, serde::Deserialize)]
#[serde(untagged)] #[serde(untagged)]