Merge branch 'master' of https://github.com/yohaybn/Israeli-Financial-Overview

Author: yohaybn

.github/workflows/deploy.yml

@@ -1,108 +1,81 @@
 name: Build and Publish
 
 on:
-  release:
-    types: [published]
-  workflow_dispatch:
-    inputs:
-      version:
-        description: "Optional image version override (e.g. 1.2.3)"
-        required: false
-        type: string
-  repository_dispatch:
-    types: [build-deploy]
+  push:
+    branches:
+      - main
+      - master
+    tags:
+      - 'v*'
 
 env:
   REGISTRY: ghcr.io
 
 jobs:
-  build-app:
+  # Bump patch version on every push to main/master (skipped on tag pushes and on the
+  # bot's own follow-up commit). Uses GITHUB_TOKEN; the resulting commit/tag will not
+  # retrigger this workflow, so build-app/build-addon must `needs:` this job to see
+  # the new version in ha-addon/config.yaml + server/package.json.
+  bump-version:
     runs-on: ubuntu-latest
-    outputs:
-      version: ${{ steps.ver.outputs.version }}
     permissions:
-      contents: read
-      packages: write
-
+      contents: write
+    if: >-
+      github.event_name == 'push' &&
+      !startsWith(github.ref, 'refs/tags/') &&
+      !contains(github.event.head_commit.message, '[skip ci]') &&
+      !contains(github.event.head_commit.message, 'chore(release):')
+    outputs:
+      version: ${{ steps.bump.outputs.version }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event_name == 'release' && github.event.release.tag_name || github.ref }}
-
-      - name: Set Docker image name (lowercase for GHCR)
-        run: echo "IMAGE_NAME=$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Resolve image version
-        id: ver
-        run: |
-          v=""
-          if [ "${{ github.event_name }}" = "release" ]; then
-            v="${{ github.event.release.tag_name }}"
-            v="${v#v}"
-          elif [ "${{ github.event_name }}" = "workflow_dispatch" ] && [ -n "${{ inputs.version }}" ]; then
-            v="${{ inputs.version }}"
-          elif [ "${{ github.event_name }}" = "repository_dispatch" ] && [ -n "${{ github.event.client_payload.version }}" ]; then
-            v="${{ github.event.client_payload.version }}"
-          fi
-          if [ -z "$v" ]; then
-            v=$(node -e "console.log(require('./server/package.json').version)")
-          fi
-          echo "version=$v" >> "$GITHUB_OUTPUT"
-          echo "Resolved version: $v"
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
+      - name: Use Node 20
+        uses: actions/setup-node@v4
         with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+          node-version: '20'
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+      - name: Bump patch version
+        id: bump
+        run: |
+          node scripts/bump-version.mjs patch
+          NEW_VERSION=$(node -e "console.log(require('./server/package.json').version)")
+          echo "version=$NEW_VERSION" >> "$GITHUB_OUTPUT"
 
-      - name: Build and push App image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./Dockerfile.app
-          push: true
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          tags: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-app:${{ steps.ver.outputs.version }}
-          build-args: |
-            VITE_APP_BUILD_VERSION=v${{ steps.ver.outputs.version }}@${{ github.sha }}
-            VITE_INSTALL_KIND=docker
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+      - name: Commit and tag
+        env:
+          NEW_VERSION: ${{ steps.bump.outputs.version }}
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git add server/package.json Dockerfile
+          if git diff --cached --quiet; then
+            echo "No version change to commit."
+            exit 0
+          fi
+          git commit -m "chore(release): ${NEW_VERSION} [skip ci]"
+          git tag "v${NEW_VERSION}"
+          git push
+          git push --tags
 
-  build-addon:
-    needs: [build-app]
+  build-app:
+    runs-on: ubuntu-latest
+    needs: [bump-version]
     if: |
       always() &&
-      needs.build-app.result == 'success'
-    runs-on: ubuntu-latest
+      (needs.bump-version.result == 'success' || needs.bump-version.result == 'skipped')
     permissions:
       contents: read
       packages: write
 
-    strategy:
-      matrix:
-        arch: [amd64, aarch64, armv7]
-        include:
-          - arch: amd64
-            platform: linux/amd64
-          - arch: aarch64
-            platform: linux/arm64
-          - arch: armv7
-            platform: linux/arm/v7
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        # Pull the freshly-bumped commit (HEAD on the branch already moved by bump-version).
         with:
           ref: ${{ github.ref }}
 
@@ -111,9 +84,12 @@ jobs:
 
       - name: Resolve image version
         id: ver
+        # Prefer the bumped version (set on push to main); fall back to ha-addon/config.yaml on tag pushes.
         run: |
-          # Reuse the exact app image version so all published images stay in sync.
-          v="${{ needs.build-app.outputs.version }}"
+          v="${{ needs.bump-version.outputs.version }}"
+          if [ -z "$v" ]; then
+            v=$(awk -F'"' '/^version:/ {print $2; exit}' ha-addon/config.yaml)
+          fi
           echo "version=$v" >> "$GITHUB_OUTPUT"
           echo "Resolved version: $v"
 
@@ -130,42 +106,23 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Build and push Add-on image
+      - name: Build and push App image
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./Dockerfile
+          file: ./Dockerfile.app
           push: true
-          platforms: ${{ matrix.platform }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
           tags: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-addon-${{ matrix.arch }}:${{ steps.ver.outputs.version }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-app:${{ steps.ver.outputs.version }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-app:main
           build-args: |
-            BUILD_FROM=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-app:${{ steps.ver.outputs.version }}
-            BUILD_VERSION=${{ steps.ver.outputs.version }}
             VITE_APP_BUILD_VERSION=v${{ steps.ver.outputs.version }}@${{ github.sha }}
             VITE_INSTALL_KIND=docker
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-  sync-addon-repo:
-    needs: [build-app, build-addon]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
 
-      - name: Resolve image version
-        id: ver
-        run: |
-          v="${{ needs.build-app.outputs.version }}"
-          echo "version=$v" >> "$GITHUB_OUTPUT"
 
-      - name: Trigger version bump in HA Repository
-        uses: peter-evans/repository-dispatch@v3
-        with:
-          token: ${{ secrets.HA_REPO_SYNC_PAT }}
-          repository: yohaybn/israeli-financial-overview-ha
-          event-type: update-version
-          client-payload: '{"version": "${{ steps.ver.outputs.version }}"}'
+  
+        

Dockerfile

@@ -41,7 +41,7 @@ RUN npm install
 # Build workspaces in order
 RUN npm run build -w shared
 # Supervisor / CI passes BUILD_VERSION from ha-addon/config.yaml version; CI may pass VITE_APP_BUILD_VERSION (tag@sha) instead.
-ARG BUILD_VERSION=1.3.28
+ARG BUILD_VERSION=1.3.29
 ARG VITE_APP_BUILD_VERSION=
 ARG VITE_INSTALL_KIND=docker
 ENV VITE_INSTALL_KIND=docker

server/package.json

@@ -1,6 +1,6 @@
 {
     "name": "server",
-    "version": "1.3.28",
+    "version": "1.3.29",
     "type": "module",
     "description": "",
     "main": "dist/index.js",