Merge pull request #944 from WatWowMap/develop

Sync Dev to Main

.github/workflows/config.yml

@@ -1,17 +1,17 @@
 name: Config
 on:
-  push:
-    branches:
-      - main
-      - develop
+  workflow_run:
+    workflows: [Lint]
+    types: [completed]
+    branches: [main, develop]
 
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  Sync:
-    name: Check for config changes
+  config:
+    name: Config Sync
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code

.github/workflows/docker.yml

@@ -1,5 +1,10 @@
 name: Docker
-on: [push]
+on:
+  workflow_run:
+    workflows: [Config, Locales]
+    types: [completed]
+  release:
+    types: [prereleased, released]
 
 env:
   REGISTRY: ghcr.io
@@ -10,7 +15,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

@@ -3,7 +3,7 @@ on: [push]
 
 jobs:
   lint:
-    name: Run Basic Checks
+    name: Lint Check
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code

.github/workflows/locales.yml

@@ -1,16 +1,17 @@
 name: Locales
 on:
-  push:
-    branches:
-      - main
+  workflow_run:
+    workflows: [Lint]
+    types: [completed]
+    branches: [main]
 
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  Sync:
-    name: Generate missing locales with chatgpt
+  locales:
+    name: Locales Sync
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -43,3 +44,6 @@ jobs:
           git add --all
           git commit --message "chore: sync locales"
           git push
+          git checkout develop
+          git merge main
+          git push origin develop

.github/workflows/main.yml → .github/workflows/release-base.yml

@@ -1,17 +1,11 @@
-name: GitHub Release
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-      - develop
+name: Release
+on: workflow_call
 
 permissions: write-all
 
 jobs:
   release:
-    name: Build & release
+    name: GitHub Release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.github/workflows/release-develop.yml

@@ -0,0 +1,11 @@
+name: Release Develop
+
+on:
+  workflow_run:
+    workflows: [Config]
+    types: [completed]
+    branches: [develop]
+
+jobs:
+  release-develop:
+    uses: WatWowMap/ReactMap/.github/workflows/release-base.yml@develop

.github/workflows/release-main.yml

@@ -0,0 +1,11 @@
+name: Release Main
+
+on:
+  workflow_run:
+    workflows: [Locales]
+    types: [completed]
+    branches: [main]
+
+jobs:
+  release-main:
+    uses: WatWowMap/ReactMap/.github/workflows/release-base.yml@main

.github/workflows/release.yml → .github/workflows/sentry.yml

@@ -1,8 +1,11 @@
-name: Release
-on: [release]
+name: Sentry
+on:
+  release:
+    types: [prereleased, released]
 
 jobs:
   sentry:
+    name: Sentry
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code

.gitignore

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

.vscode/settings.json

@@ -1,7 +1,8 @@
 {
   "i18n-ally.localesPaths": [
     "packages/locales/lib/human",
-    "packages/locales/lib/generated"
+    "packages/locales/lib/generated",
+    "packages/locales/lib/data"
   ],
   "i18n-ally.keystyle": "flat",
   "[javascript]": {
@@ -14,4 +15,4 @@
   },
   "editor.formatOnSave": true,
   "docwriter.style": "JSDoc"
-}
+}