diff --git a/.forgejo/workflows/deploy-prod.yml b/.forgejo/workflows/deploy-prod.yml index 3be8f9e..5a3e807 100644 --- a/.forgejo/workflows/deploy-prod.yml +++ b/.forgejo/workflows/deploy-prod.yml @@ -33,7 +33,7 @@ jobs: VERSION="${GITHUB_REF_NAME#v}" CHANNEL="release" else - VERSION="${BASE}-rc.${GITHUB_SHA:0:8}" + VERSION="${BASE}" CHANNEL="main" fi echo "VERSION=${VERSION}" >> "$GITHUB_ENV" diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index 1bbbe1e..cfb7dbc 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -32,7 +32,7 @@ jobs: VERSION="${GITHUB_REF_NAME#v}" CHANNEL="release" else - VERSION="${BASE}-dev.${GITHUB_SHA:0:8}" + VERSION="${BASE}" CHANNEL="dev" fi echo "VERSION=${VERSION}" >> "$GITHUB_ENV" diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b65f49..2c91866 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# v0.4.6 — Kaal versienummer op alle builds + +## Wijziging in v0.4.6 + +De deploy-workflows tonen nu overal het kale versienummer uit het `VERSION`- +bestand (of de tagnaam), zonder `-dev`/`-rc.`-suffix. Eenvoudiger te lezen; +bump bij elke wijziging gewoon `VERSION`. + +--- + # v0.4.5 — Releases & in-app update-check ## Nieuw in v0.4.5 diff --git a/VERSION b/VERSION index 0bfccb0..ef52a64 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.5 +0.4.6 diff --git a/server-up/app.py b/server-up/app.py index f9092d3..ec308d1 100644 --- a/server-up/app.py +++ b/server-up/app.py @@ -18,7 +18,7 @@ from core.modules import Module, CORE, discover app = Flask(__name__, static_folder="static", template_folder="templates") -VERSION = os.environ.get("SU_VERSION", "0.4.5") +VERSION = os.environ.get("SU_VERSION", "0.4.6") MODULES: list[Module] = [] USER_MOD = APP / "modules" diff --git a/server-up/templates/index.html b/server-up/templates/index.html index fb15c19..f00b631 100644 --- a/server-up/templates/index.html +++ b/server-up/templates/index.html @@ -771,7 +771,7 @@ tailwind.config = {