v0.4.4 - versienummer uit centraal VERSION-bestand
All checks were successful
Deploy server-up (dev) / deploy (push) Successful in 46s
All checks were successful
Deploy server-up (dev) / deploy (push) Successful in 46s
This commit is contained in:
parent
1eab7c07df
commit
7dfb6a0abb
6 changed files with 24 additions and 4 deletions
|
|
@ -28,11 +28,12 @@ jobs:
|
||||||
id: version
|
id: version
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
BASE="$(cat VERSION 2>/dev/null || echo 0.0.0)"
|
||||||
if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
|
if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
|
||||||
VERSION="${GITHUB_REF_NAME#v}"
|
VERSION="${GITHUB_REF_NAME#v}"
|
||||||
CHANNEL="release"
|
CHANNEL="release"
|
||||||
else
|
else
|
||||||
VERSION="main-${GITHUB_SHA:0:8}"
|
VERSION="${BASE}-rc.${GITHUB_SHA:0:8}"
|
||||||
CHANNEL="main"
|
CHANNEL="main"
|
||||||
fi
|
fi
|
||||||
echo "VERSION=${VERSION}" >> "$GITHUB_ENV"
|
echo "VERSION=${VERSION}" >> "$GITHUB_ENV"
|
||||||
|
|
|
||||||
|
|
@ -27,11 +27,12 @@ jobs:
|
||||||
id: version
|
id: version
|
||||||
run: |
|
run: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
BASE="$(cat VERSION 2>/dev/null || echo 0.0.0)"
|
||||||
if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
|
if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
|
||||||
VERSION="${GITHUB_REF_NAME#v}"
|
VERSION="${GITHUB_REF_NAME#v}"
|
||||||
CHANNEL="release"
|
CHANNEL="release"
|
||||||
else
|
else
|
||||||
VERSION="dev-${GITHUB_SHA:0:8}"
|
VERSION="${BASE}-dev.${GITHUB_SHA:0:8}"
|
||||||
CHANNEL="dev"
|
CHANNEL="dev"
|
||||||
fi
|
fi
|
||||||
echo "VERSION=${VERSION}" >> "$GITHUB_ENV"
|
echo "VERSION=${VERSION}" >> "$GITHUB_ENV"
|
||||||
|
|
|
||||||
17
CHANGELOG.md
17
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.<sha>`
|
||||||
|
- push naar `dev` → `0.4.4-dev.<sha>`
|
||||||
|
|
||||||
|
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
|
# v0.4.3 — Auto-logo's legacy-apps + fix lege Docker Images
|
||||||
|
|
||||||
## Nieuw / fixes in v0.4.3
|
## Nieuw / fixes in v0.4.3
|
||||||
|
|
|
||||||
1
VERSION
Normal file
1
VERSION
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
0.4.4
|
||||||
|
|
@ -18,7 +18,7 @@ from core.modules import Module, CORE, discover
|
||||||
|
|
||||||
app = Flask(__name__, static_folder="static", template_folder="templates")
|
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] = []
|
MODULES: list[Module] = []
|
||||||
USER_MOD = APP / "modules"
|
USER_MOD = APP / "modules"
|
||||||
|
|
|
||||||
|
|
@ -728,7 +728,7 @@ tailwind.config = {
|
||||||
<script>
|
<script>
|
||||||
function app() {
|
function app() {
|
||||||
return {
|
return {
|
||||||
version: '0.4.3',
|
version: '0.4.4',
|
||||||
page: location.hash.slice(1) || 'dashboard',
|
page: location.hash.slice(1) || 'dashboard',
|
||||||
isMobile: window.innerWidth < 768,
|
isMobile: window.innerWidth < 768,
|
||||||
sidebarOpen: window.innerWidth >= 768 && localStorage.getItem('sidebar') !== 'closed',
|
sidebarOpen: window.innerWidth >= 768 && localStorage.getItem('sidebar') !== 'closed',
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue