Merge branch 'develop' into better-multi-domain

.github/workflows/config.yml

@@ -1,17 +1,10 @@
 name: Config
-on:
-  push:
-    branches:
-      - main
-      - develop
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
+on: workflow_call
 
 jobs:
-  Sync:
-    name: Check for config changes
+  config:
+    if: ${{ github.ref_name == 'main' || github.ref_name == 'develop'}}
+    name: Config Sync
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -40,5 +33,5 @@ jobs:
         if: ${{ env.changes_exist == 'true' }}
         run: |
           git add --all
-          git commit --message "chore: Sync CI/CD Config Items"
+          git commit --message "chore: Sync Config [skip ci]"
           git push

.github/workflows/docker.yml

@@ -1,5 +1,5 @@
 name: Docker
-on: [push]
+on: workflow_call
 
 env:
   REGISTRY: ghcr.io
@@ -10,7 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-
       - name: Set .gitsha
         if: github.event_name == 'push'
         run: 'echo ${{github.sha}} > .gitsha'

.github/workflows/lint.yml

@@ -1,9 +1,9 @@
 name: Lint
-on: [push]
+on: [push, pull_request]
 
 jobs:
   lint:
-    name: Run Basic Checks
+    name: Lint Check
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
@@ -12,9 +12,9 @@ jobs:
         with:
           fetch-depth: 2
       - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'yarn'
 
       - name: Install Dependencies

.github/workflows/locales.yml

@@ -1,16 +1,12 @@
 name: Locales
-on:
-  push:
-    branches:
-      - main
+on: workflow_call
 
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
+permissions: write-all
 
 jobs:
-  Sync:
-    name: Generate missing locales with chatgpt
+  locales:
+    if: ${{ github.ref_name == 'main' }}
+    name: Locales Sync
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -39,7 +35,12 @@ jobs:
           fi
       - name: Commit and push changes
         if: ${{ env.changes_exist == 'true' }}
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           git add --all
-          git commit --message "chore: sync locales"
+          git commit --message "chore: sync locales [skip ci]"
           git push
+          git checkout develop
+          git merge main
+          git push origin develop

.github/workflows/main.yml

@@ -1,37 +1,12 @@
-name: GitHub Release
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-      - develop
-
-permissions: write-all
+name: Main CI
+on: [push, pull_request]
 
 jobs:
+  config:
+    uses: ./.github/workflows/config.yml
+  locales:
+    uses: ./.github/workflows/locales.yml
   release:
-    name: Build & release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Install Volta
-        uses: volta-cli/action@v4
-      - name: Echo versions
-        run: |
-          node --version
-          yarn --version
-      - name: Install dependencies
-        run: yarn --prefer-offline
-        env:
-          HUSKY: 0
-      - name: Build app
-        run: yarn build
-      - name: Release
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          HUSKY: 0
-        run: npx semantic-release
+    uses: ./.github/workflows/release.yml
+  docker:
+    uses: ./.github/workflows/docker.yml

.github/workflows/release.yml

@@ -1,28 +1,32 @@
 name: Release
-on: [release]
+on: workflow_call
+
+permissions: write-all
 
 jobs:
-  sentry:
+  release:
+    if: ${{ github.ref_name == 'main' || github.ref_name == 'develop'}}
+    name: GitHub Release
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Code
-        id: checkout-code
+      - name: Checkout
         uses: actions/checkout@v3
         with:
-          fetch-depth: 2
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          cache: 'yarn'
-
-      - name: Install Dependencies
-        run: yarn
-
-      - name: Sentry Build
-        run: yarn release
+          fetch-depth: 0
+      - name: Install Volta
+        uses: volta-cli/action@v4
+      - name: Echo versions
+        run: |
+          node --version
+          yarn --version
+      - name: Install dependencies
+        run: yarn --prefer-offline
+        env:
+          HUSKY: 0
+      - name: Build app
+        run: yarn build
+      - name: Release
         env:
-          SENTRY_AUTH_TOKEN: ${{secrets.SENTRY_AUTH_TOKEN}}
-          SENTRY_DSN: ${{secrets.SENTRY_DSN}}
-          SENTRY_ORG: ${{secrets.SENTRY_ORG}}
-          SENTRY_PROJECT: ${{secrets.SENTRY_PROJECT}}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          HUSKY: 0
+        run: npx semantic-release

.github/workflows/sentry.yml

@@ -0,0 +1,31 @@
+name: Sentry
+on:
+  release:
+    types: [published]
+
+jobs:
+  sentry:
+    name: Sentry
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        id: checkout-code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
+      - name: Setup Node.js environment
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: 'yarn'
+
+      - name: Install Dependencies
+        run: yarn
+
+      - name: Sentry Build
+        run: yarn release
+        env:
+          SENTRY_AUTH_TOKEN: ${{secrets.SENTRY_AUTH_TOKEN}}
+          SENTRY_DSN: ${{secrets.SENTRY_DSN}}
+          SENTRY_ORG: ${{secrets.SENTRY_ORG}}
+          SENTRY_PROJECT: ${{secrets.SENTRY_PROJECT}}

.gitignore

@@ -85,3 +85,7 @@ src/**/*.custom.css
 server/src/models/queries/*
 /logs/*
 !/logs/.gitkeep
+
+# Cache
+server/.cache/*
+!/server/.cache/.gitkeep