release: 8.2604.109

.github/workflows/ci.yaml

@@ -2,28 +2,24 @@ name: CI
 
 on:
   pull_request:
-    branches: ["*"]
+    branches: ['*']
   push:
-    branches: ["main"]
+    branches: ['main']
   merge_group:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
-# You can leverage Vercel Remote Caching with Turbo to speed up your builds
-# @link https://turborepo.org/docs/core-concepts/remote-caching#remote-caching-on-vercel-builds
 env:
   FORCE_COLOR: 3
-  TURBO_TEAM: ${{ vars.TURBO_TEAM }}
-  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
   CI: true
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Setup
         uses: ./tooling/github/setup
@@ -34,7 +30,7 @@ jobs:
   format:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Setup
         uses: ./tooling/github/setup
@@ -45,7 +41,7 @@ jobs:
   typecheck:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Setup
         uses: ./tooling/github/setup
@@ -56,7 +52,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Setup
         uses: ./tooling/github/setup
@@ -66,12 +62,9 @@ jobs:
           echo "JWT_SECRET=${{ vars.TEST_JWT_SECRET }}" >> ./apps/api/.env.test
           echo "OPENSEARCH_USE=true" >> ./apps/api/.env.test
           echo "OPENSEARCH_NODE=http://localhost:9200" >> ./apps/api/.env.test
-          echo "OPENSEARCH_USERNAME=''" >> ./apps/api/.env.test
-          echo "OPENSEARCH_PASSWORD=''" >> ./apps/api/.env.test
           echo "SMTP_HOST='localhost'" >> ./apps/api/.env.test
           echo "SMTP_PORT=25" >> ./apps/api/.env.test
           echo "SMTP_SENDER='user@feedback.com'" >> ./apps/api/.env.test
-          echo "SMTP_BASE_URL='http://localhost:3000'" >> ./apps/api/.env.test
 
       - name: Run Tests
         run: pnpm test
@@ -84,7 +77,6 @@ jobs:
           echo "SMTP_HOST='localhost'" >> ./apps/api/.env.test
           echo "SMTP_PORT=25" >> ./apps/api/.env.test
           echo "SMTP_SENDER='user@feedback.com'" >> ./apps/api/.env.test
-          echo "SMTP_BASE_URL='http://localhost:3000'" >> ./apps/api/.env.test
 
       - name: Run Tests
         run: pnpm test

.github/workflows/docker-dev-image.yml

@@ -6,13 +6,18 @@ on:
       - '**-dev'
 
 jobs:
-  api-build:
+  build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
-      - name: Docker meta
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: docker-container
+
+      - name: Docker meta for API
         id: api-meta
         uses: docker/metadata-action@v5
         with:
@@ -23,29 +28,7 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
 
-      - name: Login to DockerHub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push API
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./docker/api.dockerfile
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.api-meta.outputs.tags }}
-          labels: ${{ steps.api-meta.outputs.labels }}
-
-  web-build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v5
-
-      - name: Docker meta
+      - name: Docker meta for Web
         id: web-meta
         uses: docker/metadata-action@v5
         with:
@@ -63,11 +46,12 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build and push Web
-        uses: docker/build-push-action@v6
+      - name: Bake and push multi-platform Docker images
+        uses: docker/bake-action@v6
         with:
-          context: .
-          file: ./docker/web.dockerfile
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.web-meta.outputs.tags }}
-          labels: ${{ steps.web-meta.outputs.labels }}
+          files: |
+            ./docker/docker-bake.hcl
+          push: true
+          set: |
+            api.tags=${{ steps.api-meta.outputs.tags }}
+            web.tags=${{ steps.web-meta.outputs.tags }}

.github/workflows/docker-prod-image.yml

@@ -8,13 +8,18 @@ on:
       - '!**-dev'
 
 jobs:
-  api-build:
+  build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
-      - name: Docker meta
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: docker-container
+
+      - name: Docker meta for API
         id: api-meta
         uses: docker/metadata-action@v5
         with:
@@ -25,29 +30,7 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
 
-      - name: Login to DockerHub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push API
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./docker/api.dockerfile
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.api-meta.outputs.tags }}
-          labels: ${{ steps.api-meta.outputs.labels }}
-
-  web-build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v5
-
-      - name: Docker meta
+      - name: Docker meta for Web
         id: web-meta
         uses: docker/metadata-action@v5
         with:
@@ -65,11 +48,12 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build and push Web
-        uses: docker/build-push-action@v6
+      - name: Bake and push multi-platform Docker images
+        uses: docker/bake-action@v6
         with:
-          context: .
-          file: ./docker/web.dockerfile
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.web-meta.outputs.tags }}
-          labels: ${{ steps.web-meta.outputs.labels }}
+          files: |
+            ./docker/docker-bake.hcl
+          push: true
+          set: |
+            api.tags=${{ steps.api-meta.outputs.tags }}
+            web.tags=${{ steps.web-meta.outputs.tags }}

.github/workflows/e2e-test.yml

@@ -7,43 +7,61 @@ on:
 jobs:
   e2e-test:
     runs-on: ubuntu-latest
-    # services:
-    #   mysql:
-    #     image: mysql:8.0.39
-    #     env:
-    #       MYSQL_ROOT_PASSWORD: userfeedback
-    #       MYSQL_DATABASE: e2e
-    #       MYSQL_USER: userfeedback
-    #       MYSQL_PASSWORD: userfeedback
-    #       TZ: UTC
-    #     ports:
-    #       - 13307:3306
-    #     options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-    #   smtp:
-    #     image: rnwood/smtp4dev:v3
-    #     ports:
-    #       - 5080:80
-    #       - 25:25
-    #       - 143:143
-    # opensearch:
-    #   image: opensearchproject/opensearch:2.4.1
-    #   ports:
-    #     - 9200:9200
+    services:
+      mysql:
+        image: mysql:8.0.39
+        env:
+          MYSQL_ROOT_PASSWORD: userfeedback
+          MYSQL_DATABASE: e2e
+          MYSQL_USER: userfeedback
+          MYSQL_PASSWORD: userfeedback
+          TZ: UTC
+        ports:
+          - 13307:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+      smtp:
+        image: rnwood/smtp4dev:v3
+        ports:
+          - 5080:80
+          - 25:25
+          - 143:143
+      opensearch:
+        image: opensearchproject/opensearch:2.4.1
+        env:
+          discovery.type: single-node
+          bootstrap.memory_lock: 'true'
+          plugins.security.disabled: 'true'
+        options: >-
+          --health-cmd="curl -s http://localhost:9200/_cluster/health | grep -q '\"status\":\"green\"'"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=3
+        ports:
+          - 9200:9200
     steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-      # - name: Build and run
-      #   run: |
-      #     docker compose -f "./docker/docker-compose.e2e.yml" up -d
+      - uses: actions/checkout@v5
 
-      # - name: Setup e2e test
-      #   run: |
-      #     cd apps/e2e
-      #     npm install -g corepack@latest
-      #     pnpm install --frozen-lockfile
-      #     pnpm playwright install
+      - name: Setup
+        uses: ./tooling/github/setup
 
-      # - name: Run e2e tests
-      #   run: |
-      #     pnpm build
-      #     pnpm test:e2e
+      - name: Cache Playwright browsers
+        uses: actions/cache@v3
+        id: playwright-cache
+        with:
+          path: ~/.cache/ms-playwright
+          key: ${{ runner.os }}-playwright-${{ hashFiles('**/pnpm-lock.yaml') }}
+
+      - name: Install Playwright Browsers
+        if: steps.playwright-cache.outputs.cache-hit != 'true'
+        run: pnpm exec playwright install --with-deps chromium
+
+      - name: Run e2e tests
+        run: |
+          CI=true pnpm test:e2e
+
+      - uses: actions/upload-artifact@v4
+        if: always() && !cancelled()
+        with:
+          name: playwright-report
+          path: apps/e2e/playwright-report/
+          retention-days: 7

.github/workflows/integration-test.yml

@@ -10,7 +10,7 @@ jobs:
 
     services:
       mysql:
-        image: mysql:8.0.39
+        image: mysql:8.0
         env:
           MYSQL_ROOT_PASSWORD: userfeedback
           MYSQL_DATABASE: e2e
@@ -49,24 +49,20 @@ jobs:
 
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup integration test (with opensearch)
         run: |
           npm install -g corepack@latest
           corepack enable
           pnpm install --frozen-lockfile
           pnpm build
-          echo "BASE_URL=http://localhost:3000" >> ./apps/api/.env
           echo "JWT_SECRET=DEV" >> ./apps/api/.env
           echo "OPENSEARCH_USE=true" >> ./apps/api/.env
           echo "OPENSEARCH_NODE=http://localhost:9200" >> ./apps/api/.env
-          echo "OPENSEARCH_USERNAME=''" >> ./apps/api/.env
-          echo "OPENSEARCH_PASSWORD=''" >> ./apps/api/.env
           echo "SMTP_HOST='localhost'" >> ./apps/api/.env
           echo "SMTP_PORT=25" >> ./apps/api/.env
           echo "SMTP_SENDER='user@feedback.com'" >> ./apps/api/.env
-          echo "SMTP_BASE_URL='http://localhost:3000'" >> ./apps/api/.env
 
       - name: Run integration tests (with opensearch)
         run: |

.github/workflows/publish-api-docs.yml

@@ -10,7 +10,7 @@ jobs:
 
     services:
       mysql:
-        image: mysql:8.0.39
+        image: mysql:8.0
         env:
           MYSQL_ROOT_PASSWORD: userfeedback
           MYSQL_DATABASE: userfeedback
@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Build app and swagger docs
         run: |
@@ -36,7 +36,7 @@ jobs:
       - name: Run Redocly CLI
         uses: fluximus-prime/redocly-cli-github-action@v1
         with:
-          args: "build-docs apps/api/swagger.json --output docs/index.html"
+          args: 'build-docs apps/api/swagger.json --output docs/index.html'
 
       - name: Deploy to GitHub Pages
         uses: peaceiris/actions-gh-pages@v3