diff --git a/.forgejo/workflows/deploy-prod.yml b/.forgejo/workflows/deploy-prod.yml index 1452149..3be8f9e 100644 --- a/.forgejo/workflows/deploy-prod.yml +++ b/.forgejo/workflows/deploy-prod.yml @@ -28,11 +28,12 @@ jobs: id: version run: | set -euo pipefail + BASE="$(cat VERSION 2>/dev/null || echo 0.0.0)" if [[ "${GITHUB_REF}" == refs/tags/* ]]; then VERSION="${GITHUB_REF_NAME#v}" CHANNEL="release" else - VERSION="main-${GITHUB_SHA:0:8}" + VERSION="${BASE}-rc.${GITHUB_SHA:0:8}" CHANNEL="main" fi echo "VERSION=${VERSION}" >> "$GITHUB_ENV" diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index e7717d5..1bbbe1e 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -27,11 +27,12 @@ jobs: id: version run: | set -euo pipefail + BASE="$(cat VERSION 2>/dev/null || echo 0.0.0)" if [[ "${GITHUB_REF}" == refs/tags/* ]]; then VERSION="${GITHUB_REF_NAME#v}" CHANNEL="release" else - VERSION="dev-${GITHUB_SHA:0:8}" + VERSION="${BASE}-dev.${GITHUB_SHA:0:8}" CHANNEL="dev" fi echo "VERSION=${VERSION}" >> "$GITHUB_ENV" diff --git a/CHANGELOG.md b/CHANGELOG.md index 7117a0f..18ddc00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,20 @@ +# v0.4.4 — Nette versienummers op alle builds + +## Nieuw in v0.4.4 + +Centraal `VERSION`-bestand (semver) is nu de bron voor het versienummer. De +deploy-workflows lezen het en bouwen: + +- tag `v0.4.4` → `0.4.4` (productie, toont `v0.4.4`) +- push naar `main` → `0.4.4-rc.` +- push naar `dev` → `0.4.4-dev.` + +Zo zie je voortaan het échte versienummer in de topbar i.p.v. alleen de +git-SHA (`vdev-1eab7c07`). Bump bij elke wijziging alleen nog `VERSION` (en voor +de zekerheid de fallback in `app.py`/`index.html` voor lokale runs). + +--- + # v0.4.3 — Auto-logo's legacy-apps + fix lege Docker Images ## Nieuw / fixes in v0.4.3 diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..6f2743d --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.4.4 diff --git a/server-up/app.py b/server-up/app.py index 60c625b..f5f5b6c 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.3") +VERSION = os.environ.get("SU_VERSION", "0.4.4") MODULES: list[Module] = [] USER_MOD = APP / "modules" diff --git a/server-up/templates/index.html b/server-up/templates/index.html index ec356b7..2ac764f 100644 --- a/server-up/templates/index.html +++ b/server-up/templates/index.html @@ -728,7 +728,7 @@ tailwind.config = {