From b620e5319a36b19fc2cdfc7c972f1ffe02f94f30 Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Fri, 25 Nov 2022 15:45:39 -0700 Subject: [PATCH] add VERSION.txt --- .gitignore | 1 + Makefile | 5 ++++- check-version.sh | 13 +++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100755 check-version.sh diff --git a/.gitignore b/.gitignore index 06630f1f3..61d99885e 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ secrets.db /cargo-deps/**/* /ENVIRONMENT.txt /GIT_HASH.txt +/VERSION.txt /embassyos-*.tar.gz /*.deb /target diff --git a/Makefile b/Makefile index 006abdcbd..f3ee15c2b 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ ARCH = $(shell uname -m) ENVIRONMENT_FILE = $(shell ./check-environment.sh) GIT_HASH_FILE = $(shell ./check-git-hash.sh) +VERSION_FILE = $(shell ./check-version.sh) EMBASSY_BINS := backend/target/$(ARCH)-unknown-linux-gnu/release/embassyd backend/target/$(ARCH)-unknown-linux-gnu/release/embassy-init backend/target/$(ARCH)-unknown-linux-gnu/release/embassy-cli backend/target/$(ARCH)-unknown-linux-gnu/release/embassy-sdk backend/target/$(ARCH)-unknown-linux-gnu/release/avahi-alias libs/target/aarch64-unknown-linux-musl/release/embassy_container_init libs/target/x86_64-unknown-linux-musl/release/embassy_container_init EMBASSY_UIS := frontend/dist/ui frontend/dist/setup-wizard frontend/dist/diagnostic-ui frontend/dist/install-wizard BUILD_SRC := $(shell find build) @@ -22,7 +23,7 @@ $(shell sudo true) .PHONY: all gzip install clean format sdk snapshots frontends ui backend -all: $(EMBASSY_SRC) $(EMBASSY_BINS) system-images/compat/docker-images/aarch64.tar system-images/utils/docker-images/$(ARCH).tar system-images/binfmt/docker-images/$(ARCH).tar $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) +all: $(EMBASSY_SRC) $(EMBASSY_BINS) system-images/compat/docker-images/aarch64.tar system-images/utils/docker-images/$(ARCH).tar system-images/binfmt/docker-images/$(ARCH).tar $(ENVIRONMENT_FILE) $(GIT_HASH_FILE) $(VERSION_FILE) gzip: embassyos-raspi.tar.gz @@ -50,6 +51,7 @@ clean: rm -rf cargo-deps rm ENVIRONMENT.txt rm GIT_HASH.txt + rm VERSION.txt format: cd backend && cargo +nightly fmt @@ -80,6 +82,7 @@ install: all cp ENVIRONMENT.txt $(DESTDIR)/usr/lib/embassy/ cp GIT_HASH.txt $(DESTDIR)/usr/lib/embassy/ + cp VERSION.txt $(DESTDIR)/usr/lib/embassy/ mkdir -p $(DESTDIR)/usr/lib/embassy/container cp libs/target/aarch64-unknown-linux-musl/release/embassy_container_init $(DESTDIR)/usr/lib/embassy/container/embassy_container_init.arm64 diff --git a/check-version.sh b/check-version.sh new file mode 100755 index 000000000..d6765419f --- /dev/null +++ b/check-version.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +FE_VERSION="$(cat frontend/package.json | grep -Po '"version":[ \t\n]*"\K[^"]*')" + +# TODO: Validate other version sources - backend/Cargo.toml, backend/src/version/mod.rs + +VERSION=$FE_VERSION + +if ! [ -f ./VERSION.txt ] || [ "$(cat ./VERSION.txt)" != "$VERSION" ]; then + echo -n "$VERSION" > ./VERSION.txt +fi + +echo -n ./VERSION.txt \ No newline at end of file