From a812a16a27dcb162108b061f34818b1e0606b92a Mon Sep 17 00:00:00 2001 From: Mik Mueller <83001409+MikMuellerDev@users.noreply.github.com> Date: Fri, 20 May 2022 09:47:29 +0200 Subject: [PATCH] Bump version to v0.0.30-beta --- .vscode/configurationCache.log | 2 +- Makefile | 2 +- README.md | 2 +- docker/Dockerfile | 2 +- docker/docker-compose.yml | 2 +- docker/motd | 2 +- docs/CHANGELOG.md | 9 +++++++++ main.go | 2 +- update_version.py | 18 ++++++++++++++---- web/package-lock.json | 4 ++-- web/package.json | 2 +- 11 files changed, 33 insertions(+), 14 deletions(-) create mode 100644 docs/CHANGELOG.md diff --git a/.vscode/configurationCache.log b/.vscode/configurationCache.log index a44b3401..1e5cf2e1 100644 --- a/.vscode/configurationCache.log +++ b/.vscode/configurationCache.log @@ -1 +1 @@ -{"buildTargets":["all","build","build/linux_386.tar.gz","build/linux_amd64.tar.gz","build/linux_arm.tar.gz","build/linux_arm64.tar.gz","clean","cleanall","cleanweb","docker","docker-prepare","docker-push","linux","mysql","release","run","run-full","setup","sudo-docker","test","version","vite-dev","vtest","web"],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[],"compilerArgs":[]},"fileIndex":[]}} \ No newline at end of file +{"buildTargets":["all","build","build/linux_386.tar.gz","build/linux_amd64.tar.gz","build/linux_arm.tar.gz","build/linux_arm64.tar.gz","clean","cleanall","cleanweb","docker","docker-prepare","docker-push","linux","release","run","run-full","setup","sudo-docker","test","version","vite-dev","vtest","web"],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[],"compilerArgs":[]},"fileIndex":[]}} \ No newline at end of file diff --git a/Makefile b/Makefile index f6a5bc71..b2881fcc 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ appname := smarthome workingdir := smarthome sources := $(wildcard *.go) -version := 0.0.29 +version := 0.0.30-beta build = CGO_ENABLED=0 GOOS=$(1) GOARCH=$(2) go build -ldflags "-s -w" -v -o $(appname) $(4) tar = mkdir -p build && cd ../ && tar -cvzf ./$(appname)_$(1)_$(2).tar.gz $(workingdir)/$(appname) $(workingdir)/web/dist $(workingdir)/web/html $(workingdir)/resources && mv $(appname)_$(1)_$(2).tar.gz $(workingdir)/build diff --git a/README.md b/README.md index 6fc32647..e3c6e877 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Smarthome -**Version**: `0.0.29` +**Version**: `0.0.30-beta` A completely self-built Smarthome-system written in Go. diff --git a/docker/Dockerfile b/docker/Dockerfile index e6e88951..9b7d8992 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3 LABEL author="MikMuellerDev" -LABEL version="0.0.29" +LABEL version="0.0.30-beta" COPY ./app /app diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index ea9d0d0d..43c5c6f3 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.7' services: smarthome: - image: mikmuellerdev/smarthome:0.0.29 + image: mikmuellerdev/smarthome:0.0.30-beta container_name: smarthome hostname: smarthome depends_on: diff --git a/docker/motd b/docker/motd index e5370221..f769ebda 100644 --- a/docker/motd +++ b/docker/motd @@ -1,6 +1,6 @@ ######## Smarthome: A completely self-built Smarthome-system written in Go ### ### Issues : https://github.com/smarthome-go/smarthome/issues - ### ### Version : 0.0.29 + ### ### Version : 0.0.30-beta ### ### ### ### |# #########@ | diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md new file mode 100644 index 00000000..d89f7934 --- /dev/null +++ b/docs/CHANGELOG.md @@ -0,0 +1,9 @@ +## Changelog for 0.0.30-beta + +## Rooms Page +- Added support for different screen sizes, such as mobile. +- Cameras will now use the maximum space available in the *cameras* section +- The *rooms* feature is now completely finished (*rc*) + +## Backend +- Added additional error log to the function which deletes a *Homescript* diff --git a/main.go b/main.go index 1a5b3c24..fae8b05d 100644 --- a/main.go +++ b/main.go @@ -32,7 +32,7 @@ var port = 8082 // Default port on which the server listens, can be overwritten func main() { // Do not change manually, use the `make version` command instead - utils.Version = "0.0.29" + utils.Version = "0.0.30-beta" startTime := time.Now() diff --git a/update_version.py b/update_version.py index e99b17da..20c8c4b6 100644 --- a/update_version.py +++ b/update_version.py @@ -8,6 +8,7 @@ package_json_path = "web/package.json" main_go_path = "main.go" readme_path = "README.md" +changelog_path = "./docs/CHANGELOG.md" makefile_path = "Makefile" docker_compose_path = "docker/docker-compose.yml" @@ -57,7 +58,7 @@ with open(package_json_path, "r") as package_json: content = package_json.read() old_version = content.split("\"version\": \"")[1].split("\",\n")[0] - print(f"Found old version in {package_json_path}:", old_version) + print(f"Found old version in {package_json_path}: {old_version}") with open(package_json_path, "w") as package_json: package_json.write(content.replace(old_version, VERSION)) @@ -66,16 +67,25 @@ with open(readme_path, "r") as readme: content = readme.read() old_version = content.split("**Version**: `")[1].split("`\n")[0] - print(f"Found old version in {readme_path}:", old_version) + print(f"Found old version in {readme_path}: {old_version}") with open(readme_path, "w") as readme: readme.write(content.replace(old_version, VERSION)) +# The `CHANGELOG.md` +with open(changelog_path, "r") as changelog: + content = changelog.read() + old_version = content.split("## Changelog for ")[1].split("\n")[0] + print(f"Found old version in {changelog_path}: {old_version}") + +with open(changelog_path, "w") as changelog: + changelog.write(content.replace(old_version, VERSION)) + # The `Makefile` with open(makefile_path, "r") as makefile: content = makefile.read() old_version = content.split("version := ")[1].split("\n")[0] - print(f"Found old version in {makefile_path}:", old_version) + print(f"Found old version in {makefile_path}: {old_version}") with open(makefile_path, "w") as makefile: makefile.write(content.replace(old_version, VERSION)) @@ -90,4 +100,4 @@ with open(docker_compose_path, "w") as compose: compose.write(content.replace(old_version, VERSION)) -print(f"Version has been upgraded from '{old_version}' -> '{VERSION}'") +print(f"Version has been changed from '{old_version}' -> '{VERSION}'") diff --git a/web/package-lock.json b/web/package-lock.json index 9733fa9b..4866f319 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "smarthome-web", - "version": "0.0.29", + "version": "0.0.30-beta", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "smarthome-web", - "version": "0.0.29", + "version": "0.0.30-beta", "license": "GPL-2.0-only", "dependencies": { "@smui/button": "^6.0.0-beta.15", diff --git a/web/package.json b/web/package.json index 9b8e2ac4..9a6f55c7 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "smarthome-web", - "version": "0.0.29", + "version": "0.0.30-beta", "description": "Web interface for Smarthome", "author": "MikMuellerDev", "contributors": [