Versioning

.github/workflows/docker-publish-multi.yml

@@ -130,6 +130,14 @@ jobs:
         shell: bash
         run: echo "SHORT_SHA=${GITHUB_SHA:0:7}" >> $GITHUB_ENV
 
+      - name: Read Docker version tags
+        shell: bash
+        run: |
+          DOCKER_VERSION=$(python3 -c "import json; print(json.load(open('versions.json'))['docker'].split('+', 1)[0])")
+          echo "DOCKER_VERSION=$DOCKER_VERSION" >> $GITHUB_ENV
+          echo "DOCKER_VERSION_MINOR=${DOCKER_VERSION%.*}" >> $GITHUB_ENV
+          echo "DOCKER_VERSION_MAJOR=${DOCKER_VERSION%%.*}" >> $GITHUB_ENV
+
       - name: Set up Depot CLI
         uses: depot/setup-action@v1
 
@@ -178,6 +186,14 @@ jobs:
         shell: bash
         run: echo "SHORT_SHA=${GITHUB_SHA:0:7}" >> $GITHUB_ENV
 
+      - name: Read Docker version tags
+        shell: bash
+        run: |
+          DOCKER_VERSION=$(python3 -c "import json; print(json.load(open('versions.json'))['docker'].split('+', 1)[0])")
+          echo "DOCKER_VERSION=$DOCKER_VERSION" >> $GITHUB_ENV
+          echo "DOCKER_VERSION_MINOR=${DOCKER_VERSION%.*}" >> $GITHUB_ENV
+          echo "DOCKER_VERSION_MAJOR=${DOCKER_VERSION%%.*}" >> $GITHUB_ENV
+
       - name: Set up Depot CLI
         uses: depot/setup-action@v1
 
@@ -192,7 +208,9 @@ jobs:
           platforms: linux/amd64,linux/arm64/v8
           tags: |
             frameos/frameos:${{ env.BRANCH_NAME }}-${{ env.SHORT_SHA }}
-            frameos/frameos:latest
+            frameos/frameos:${{ env.DOCKER_VERSION }}
+            frameos/frameos:${{ env.DOCKER_VERSION_MINOR }}
+            frameos/frameos:${{ env.DOCKER_VERSION_MAJOR }}
 
   update-addon-repo:
     name: Update Home Assistant Addon
@@ -216,19 +234,24 @@ jobs:
         shell: bash
         run: echo "SHORT_SHA=${GITHUB_SHA:0:7}" >> $GITHUB_ENV
 
+      - name: Read Docker version
+        shell: bash
+        run: |
+          DOCKER_VERSION=$(python3 -c "import json; print(json.load(open('versions.json'))['docker'].split('+', 1)[0])")
+          echo "DOCKER_VERSION=$DOCKER_VERSION" >> $GITHUB_ENV
+
       - name: Update version in config.yaml
         run: |
           cd home-assistant-addon/frameos
-          echo "Updating version in config.yaml to ${{ env.BRANCH_NAME }}-${{ env.SHORT_SHA }}"
-          sed -i "s/^version: .*/version: ${{ env.BRANCH_NAME }}-${{ env.SHORT_SHA }}/" config.yaml
+          echo "Updating version in config.yaml to ${{ env.DOCKER_VERSION }}"
+          sed -i "s/^version: .*/version: ${{ env.DOCKER_VERSION }}/" config.yaml
 
       - name: Commit changes
         uses: EndBug/add-and-commit@v9
         with:
-          message: "Update FrameOS version to ${{ env.BRANCH_NAME }}-${{ env.SHORT_SHA }}"
+          message: "Update FrameOS version to ${{ env.DOCKER_VERSION }}"
           add: "."
           cwd: home-assistant-addon
           push: true
           author_name: FrameOS Bot
           author_email: git@frameos.net
-

.github/workflows/e2e-docker.yml

@@ -1,8 +1,6 @@
 name: E2E Docker Image
 
 on:
-  push:
-    branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
 

frameos/src/frameos/scheduler.nim

@@ -8,7 +8,7 @@ import sequtils
 
 var thread: Thread[FrameOS]
 
-# Returns the weekday as 1=Monday .. 7=Sunday
+# Returns the weekday as 1=Monday..7=Sunday
 proc weekdayMonSun(dt: DateTime): int =
   return dt.weekday.ord + 1
 

tools/update_versions.py

@@ -103,6 +103,20 @@ def _next_calver(previous: str | None, today: dt.date) -> str:
     return f"{today.year}.{today.month}.0"
 
 
+def _max_base_version(versions: Dict[str, str]) -> str | None:
+    if not versions:
+        return None
+    bases = [value.split("+", 1)[0] for value in versions.values() if value]
+    if not bases:
+        return None
+    return max(bases, key=_parse_version)
+
+
+def _increment_base_version(version: str) -> str:
+    year, month, patch = _parse_version(version)
+    return f"{year}.{month}.{patch + 1}"
+
+
 def main() -> int:
     projects_config = json.loads(PROJECTS_FILE.read_text(encoding="utf-8"))
     tracked_files = _git_tracked_files()
@@ -115,6 +129,9 @@ def main() -> int:
     updated_versions: Dict[str, str] = dict(existing_versions)
     today = dt.datetime.utcnow().date()
 
+    project_hashes: Dict[str, str] = {}
+    changed_projects: List[str] = []
+
     for project_name, config in projects_config["projects"].items():
         includes = config.get("include", [])
         excludes = config.get("exclude", [])
@@ -126,15 +143,25 @@ def main() -> int:
         ]
 
         project_hash = _hash_files(project_files)
+        project_hashes[project_name] = project_hash
         previous = existing_versions.get(project_name)
         previous_hash = previous.split("+", 1)[1] if previous and "+" in previous else None
 
         if previous_hash == project_hash:
             updated_versions[project_name] = previous
             continue
 
-        next_version = _next_calver(previous, today)
-        updated_versions[project_name] = f"{next_version}+{project_hash}"
+        changed_projects.append(project_name)
+
+    if changed_projects:
+        max_existing_base = _max_base_version(existing_versions)
+        if max_existing_base:
+            next_version = _increment_base_version(max_existing_base)
+        else:
+            next_version = _next_calver(None, today)
+
+        for project_name in changed_projects:
+            updated_versions[project_name] = f"{next_version}+{project_hashes[project_name]}"
 
     ordered_projects = list(projects_config["projects"].keys())
     ordered_versions = {name: updated_versions[name] for name in ordered_projects if name in updated_versions}