Merge pull request #968 from WatWowMap/develop

Sync Dev to Main

.eslintignore

@@ -4,4 +4,4 @@ public/missing-locales
 public/images/custom
 public/images/uicons
 server/src/configs/
-packages/types/**/*.d.ts
+packages/**/*.d.ts

.github/workflows/config.yml

@@ -2,22 +2,20 @@ name: Config
 on: workflow_call
 
 jobs:
-  config:
-    if: ${{ github.ref_name == 'main' || github.ref_name == 'develop'}}
-    name: Config Sync
+  sync:
     runs-on: ubuntu-latest
+    env:
+      changes_exist: 'false'
     steps:
       - name: Checkout code
         id: checkout-code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 2
       - name: Run script
-        run: |
-          yarn config:check
+        run: yarn config:check
       - name: Generate latest env vars
-        run: |
-          yarn config:env
+        run: yarn config:env
       - name: Configure git
         run: |
           git config --global user.name "turtlesocks-bot"
@@ -33,5 +31,5 @@ jobs:
         if: ${{ env.changes_exist == 'true' }}
         run: |
           git add --all
-          git commit --message "chore: Sync Config [skip ci]"
+          git commit --message "chore: Sync Config"
           git push

.github/workflows/docker.yml

@@ -6,16 +6,16 @@ env:
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  Docker:
+  release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.1.1
       - name: Set .gitsha
         if: github.event_name == 'push'
-        run: 'echo ${{github.sha}} > .gitsha'
+        run: 'echo ${{ github.sha }} > .gitsha'
       - name: Set .gitref
         if: github.event_name == 'push'
-        run: 'echo ${{github.ref}} > .gitref'
+        run: 'echo ${{ github.ref }} > .gitref'
 
       - name: Log in to the Container registry
         uses: docker/login-action@v2

.github/workflows/lint.yml

@@ -1,22 +1,20 @@
 name: Lint
-on: [push, pull_request]
+on: workflow_call
 
 jobs:
-  lint:
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
-    name: Lint Check
+  run:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
         id: checkout-code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 2
       - name: Setup Node.js environment
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v4.0.2
         with:
           node-version: 20
-          cache: 'yarn'
+          cache: yarn
 
       - name: Install Dependencies
         run: yarn

.github/workflows/locales.yml

@@ -4,24 +4,23 @@ on: workflow_call
 permissions: write-all
 
 jobs:
-  locales:
+  sync:
     if: ${{ github.ref_name == 'main' }}
-    name: Locales Sync
     runs-on: ubuntu-latest
+    env:
+      changes_exist: 'false'
     steps:
       - name: Checkout code
         id: checkout-code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 2
       - name: Install dependencies
-        run: |
-          yarn
+        run: yarn
       - name: Run generating script
-        run: |
-          yarn locales:generate
+        run: yarn locales:generate
         env:
-          OPENAI_API_KEY: ${{secrets.OPENAI_API_KEY}}
+          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
       - name: Configure git
         run: |
           git config --global user.name "turtlesocks-bot"
@@ -39,7 +38,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           git add --all
-          git commit --message "chore: sync locales [skip ci]"
+          git commit --message "chore: sync locales"
           git push
           git checkout develop
           git merge main

.github/workflows/main.yml

@@ -1,16 +1,22 @@
 name: Main CI
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+      - develop
 
 jobs:
+  lint:
+    uses: ./.github/workflows/lint.yml
   config:
     uses: ./.github/workflows/config.yml
   locales:
     uses: ./.github/workflows/locales.yml
   release:
-    uses: ./.github/workflows/release.yml
-    needs: [config, locales]
     if: always()
+    uses: ./.github/workflows/release.yml
+    needs: [config, locales, lint]
   docker:
-    if: (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository) && always()
+    if: always()
     uses: ./.github/workflows/docker.yml
-    needs: [config, locales]
+    needs: [config, locales, lint]

.github/workflows/pr.yml

@@ -0,0 +1,9 @@
+name: Pull Request
+on: pull_request
+
+jobs:
+  lint:
+    uses: ./.github/workflows/lint.yml
+  docker:
+    if: github.event.pull_request.head.repo.full_name == github.repository
+    uses: ./.github/workflows/docker.yml

.github/workflows/release.yml

@@ -4,13 +4,12 @@ on: workflow_call
 permissions: write-all
 
 jobs:
-  release:
+  run:
     if: ${{ github.ref_name == 'main' || github.ref_name == 'develop'}}
-    name: GitHub Release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 0
       - name: Install Volta

.github/workflows/sentry.yml

@@ -1,31 +1,30 @@
 name: Sentry
 on:
   release:
-    types: [created, published]
+    types: [created, published, prereleased, released]
 
 jobs:
-  sentry:
-    name: Sentry
+  release:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
         id: checkout-code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 2
       - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4.0.2
         with:
-          node-version: 18
-          cache: 'yarn'
+          node-version: 20
+          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}}
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}