.github/workflows/cd.yml

@@ -3,18 +3,13 @@ name: Create docker images
 on:
   push:
     tags:
-      - "v*.*.*"
+      - 'v*.*.*'
   workflow_dispatch:
     inputs:
       version:
-        description: "Optional image version (e.g. 3.0.0, v3.0.0, or 3.0.0-beta.1)"
+        description: 'Optional image version (e.g. 3.0.0, v3.0.0, or 3.0.0-beta.1)'
         required: false
-        default: ""
+        default: ''
-      include_latest:
-        description: "Include latest tag"
-        required: false
-        type: boolean
-        default: true
 
 jobs:
   build:
@@ -27,9 +22,6 @@ jobs:
     steps:
       - uses: actions/checkout@v5
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -54,7 +46,6 @@ jobs:
           INPUT="${{ github.event.inputs.version }}"
           REF_TYPE="${{ github.ref_type }}"
           REF_NAME="${{ github.ref_name }}"
-          INCLUDE_LATEST="${{ github.event.inputs.include_latest }}"
 
           # Determine version source
           if [[ -n "$INPUT" ]]; then
@@ -65,8 +56,7 @@ jobs:
             VERSION=""
           fi
 
-          GHCR_TAGS=""
+          TAGS=""
-          DOCKER_TAGS=""
 
           if [[ -n "$VERSION" ]]; then
             MAJOR=$(echo "$VERSION" | cut -d. -f1)
@@ -74,54 +64,37 @@ jobs:
 
             if [[ "$VERSION" == *-* ]]; then
               # prerelease: only version tag
-              GHCR_TAGS="ghcr.io/${{ github.repository }}:$VERSION"
+              TAGS="$VERSION"
-              DOCKER_TAGS="umamisoftware/umami:$VERSION"
             else
-              # stable release: version + hierarchy
+              # stable release: version + hierarchy + latest
-              GHCR_TAGS="ghcr.io/${{ github.repository }}:$VERSION"
+              TAGS="$VERSION,${MAJOR}.${MINOR},${MAJOR},postgresql-latest,latest"
-              GHCR_TAGS="$GHCR_TAGS,ghcr.io/${{ github.repository }}:${MAJOR}.${MINOR}"
-              GHCR_TAGS="$GHCR_TAGS,ghcr.io/${{ github.repository }}:${MAJOR}"
-              GHCR_TAGS="$GHCR_TAGS,ghcr.io/${{ github.repository }}:postgresql-latest"
-          
-              DOCKER_TAGS="umamisoftware/umami:$VERSION"
-              DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:${MAJOR}.${MINOR}"
-              DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:${MAJOR}"
-              DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:postgresql-latest"
-          
-              # Add latest tag based on trigger and input
-              if [[ "$REF_TYPE" == "tag" ]] || [[ "$INCLUDE_LATEST" == "true" ]]; then
-                GHCR_TAGS="$GHCR_TAGS,ghcr.io/${{ github.repository }}:latest"
-                DOCKER_TAGS="$DOCKER_TAGS,umamisoftware/umami:latest"
-              fi
             fi
           else
             # Non-tag build (e.g. from main branch)
-            GHCR_TAGS="ghcr.io/${{ github.repository }}:${REF_NAME}"
+            TAGS="${REF_NAME}"
-            DOCKER_TAGS="umamisoftware/umami:${REF_NAME}"
           fi
 
-          echo "ghcr_tags=$GHCR_TAGS" >> $GITHUB_OUTPUT
+          echo "tags=$TAGS" >> $GITHUB_OUTPUT
-          echo "docker_tags=$DOCKER_TAGS" >> $GITHUB_OUTPUT
+          echo "Computed tags: $TAGS"
-          echo "Computed GHCR tags: $GHCR_TAGS"
-          echo "Computed Docker Hub tags: $DOCKER_TAGS"
 
-      - name: Build and push to GHCR
+      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        run: |
-        with:
+          TAGS="${{ steps.compute.outputs.tags }}"
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.compute.outputs.ghcr_tags }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
 
-      - name: Build and push to Docker Hub
+          # Set image targets conditionally
-        if: github.repository == 'umami-software/umami'
+          if [[ "${{ github.repository }}" == "umami-software/umami" ]]; then
-        uses: docker/build-push-action@v5
+            IMAGES=("umamisoftware/umami" "ghcr.io/${{ github.repository }}")
-        with:
+          else
-          context: .
+            IMAGES=("ghcr.io/${{ github.repository }}")
-          platforms: linux/amd64,linux/arm64
+          fi
-          push: true
+
-          tags: ${{ steps.compute.outputs.docker_tags }}
+          for IMAGE in "${IMAGES[@]}"; do
-          cache-from: type=gha
+            echo "Building and pushing $IMAGE with tags: $TAGS"
-          cache-to: type=gha,mode=max
+            docker buildx build \
+              --platform linux/amd64,linux/arm64 \
+              --push \
+              $(echo "$TAGS" | tr ',' '\n' | sed "s|^|--tag ${IMAGE}:|") \
+              --cache-from type=gha \
+              --cache-to type=gha,mode=max \
+              .
+          done

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: Node.js CI
 on: [push]
 
 env:
-  DATABASE_URL: "postgresql://user:pass@localhost:5432/dummy"
+  DATABASE_TYPE: postgresql
   SKIP_DB_CHECK: 1
 
 jobs:
@@ -11,18 +11,27 @@ jobs:
     if: github.repository == 'umami-software/umami'
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        include:
+        - node-version: 18.18
+          pnpm-version: 10
+          db-type: postgresql
+
     steps:
-      - uses: actions/checkout@v4
+    - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
+    - uses: pnpm/action-setup@v4 # required so that setup-node will work
-        with:
+      with:
-          version: 10
+        version: ${{ matrix.pnpm-version }}
-          run_install: false
+        run_install: false
-      - name: Use Node.js 18.18
+    - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+      uses: actions/setup-node@v4
-        with:
+      with:
-          node-version: 18.18
+        node-version: ${{ matrix.node-version }}
-          cache: "pnpm"
+        cache: 'pnpm'
-      - run: npm install --global pnpm
+      env:
-      - run: pnpm install
+        DATABASE_TYPE: ${{ matrix.db-type }}
-      - run: pnpm test
+    - run: npm install --global pnpm
-      - run: pnpm build
+    - run: pnpm install
+    - run: pnpm test
+    - run: pnpm build

package.json

@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "3.0.3",
+  "version": "3.0.2",
   "description": "A modern, privacy-focused alternative to Google Analytics.",
   "author": "Umami Software, Inc. <hello@umami.is>",
   "license": "MIT",
@@ -102,15 +102,15 @@
     "kafkajs": "^2.1.0",
     "lucide-react": "^0.543.0",
     "maxmind": "^5.0.0",
-    "next": "^15.5.9",
+    "next": "^15.5.7",
     "node-fetch": "^3.2.8",
     "npm-run-all": "^4.1.5",
     "papaparse": "^5.5.3",
     "pg": "^8.16.3",
     "prisma": "^6.18.0",
     "pure-rand": "^7.0.1",
-    "react": "^19.2.3",
+    "react": "^19.2.1",
-    "react-dom": "^19.2.3",
+    "react-dom": "^19.2.1",
     "react-error-boundary": "^4.0.4",
     "react-intl": "^7.1.14",
     "react-simple-maps": "^2.3.0",

src/lang/ja-JP.json

@@ -23,7 +23,7 @@
   "label.behavior": "行動",
   "label.boards": "ボード",
   "label.bounce-rate": "直帰率",
-  "label.breakdown": "内訳",
+  "label.breakdown": "故障",
   "label.browser": "ブラウザ",
   "label.browsers": "ブラウザ",
   "label.campaigns": "キャンペーン",