Merge branch 'dev' into feat/update-local-asset-driver

the-mirror-gdp · Jun 13, 2024 · c1d7021 · c1d7021
2 parents e98bed6 + a04822e
commit c1d7021
Show file tree

Hide file tree

Showing 92 changed files with 2,161 additions and 1,599 deletions.
diff --git a/.github/CONTRIBUTORS.md b/.github/CONTRIBUTORS.md
@@ -42,6 +42,8 @@ Jason Traeder (PapaBeefolini)
 
 Raphaël Duchaîne (duchainer)
 
+Rich Schiffer (filthyrrrich)
+
 Tarun Karki
 
 Wojtek Pe (wojtekpil)
diff --git a/.github/workflows/client-build-tool.yml b/.github/workflows/client-build-tool.yml
@@ -202,7 +202,8 @@ jobs:
 
       - name: Unit Tests
         timeout-minutes: 15
-        if: inputs.should-run-unit-tests
+        # disabled until we can fix gut
+        if: false
         run: |
           chmod +x ./${{ inputs.editor-binary-name }}
           ./${{ inputs.editor-binary-name }} -s --path ./ addons/gut/gut_cmdln.gd --headless

diff --git a/.github/workflows/deployment-pr.yml b/.github/workflows/deployment-pr.yml
@@ -24,7 +24,7 @@ jobs:
       editor-binary-name: MirrorGodotEditorWindows.exe
       editor-binary-download: MirrorGodotEditorWindows.exe
       editor-binary-branch: dev
-      editor-template-directory: ~/AppData/Roaming/Godot/export_templates/4.3.dev
+      editor-template-directory: ~/AppData/Roaming/Godot/export_templates/4.3.beta
       template-binary-workflow: deployment.yml
       template-binary-name: windows_release_x86_64.exe
       template-binary-branch: themirror
@@ -35,8 +35,8 @@ jobs:
       bucket-name: no-bucket
       os: ${{ github.event.repository.name != 'the-mirror' && 'windows-mirror' || 'windows-latest' }}
       # TODO: This will be dynamic in future and we can't do that immediately as we have to focus on the deployment side.
-      editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/e33f01e3/MirrorGodotEditorWindows.exe
-      template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/e33f01e3/windows_release_x86_64.exe
+      editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/f2020817/MirrorGodotEditorWindows.exe
+      template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/f2020817/windows_release_x86_64.exe
   build-macos-client:
     name: 🍎 Build MacOS Dev PR
     uses: ./.github/workflows/client-build-tool.yml
@@ -50,7 +50,7 @@ jobs:
       editor-binary-download: MirrorGodotEditorMac.app.zip
       editor-binary-name: MirrorGodotEditorMac.app/Contents/MacOS/Godot
       editor-binary-branch: themirror
-      editor-template-directory: ~/Library/Application\ Support/Godot/export_templates/4.3.dev
+      editor-template-directory: ~/Library/Application\ Support/Godot/export_templates/4.3.beta
       template-binary-workflow: deployment.yml
       template-binary-name: macos_template.app.zip
       template-binary-branch: dev
@@ -61,8 +61,8 @@ jobs:
       bucket-name: no-bucket
       os: ${{ github.event.repository.name != 'the-mirror' && 'macos-mirror' || 'macos-latest' }}
       # TODO: This will be dynamic in future and we can't do that immediately as we have to focus on the deployment side.
-      editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/e33f01e3/MirrorGodotEditorMac.app.zip
-      template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/e33f01e3/macos_template.app.zip
+      editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/f2020817/MirrorGodotEditorMac.app.zip
+      template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/f2020817/macos_template.app.zip
   build-linux-client:
     name: 🐧 Build Linux Dev PR
     uses: ./.github/workflows/client-build-tool.yml
@@ -74,7 +74,7 @@ jobs:
       editor-binary-name: MirrorGodotEditorLinux.x86_64
       editor-binary-download: MirrorGodotEditorLinux.x86_64
       editor-binary-branch: dev
-      editor-template-directory: ~/.local/share/godot/export_templates/4.3.dev
+      editor-template-directory: ~/.local/share/godot/export_templates/4.3.beta
       template-binary-workflow: deployment.yml
       template-binary-name: linux_release.x86_64
       template-binary-branch: themirror
@@ -83,7 +83,7 @@ jobs:
       game-export-preset: Linux
       game-binary-name: The Mirror Dev.x86_64
       bucket-name: no-bucket
-      os: ${{ github.event.repository.name != 'the-mirror' && 'linux-mirror' || 'ubuntu-20.04' }}
+      os: ${{ github.event.repository.name != 'the-mirror' && 'linux-mirror' || 'ubuntu-22.04' }}
       # TODO: This will be dynamic in future and we can't do that immediately as we have to focus on the deployment side.
-      editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/e33f01e3/MirrorGodotEditorLinux.x86_64
-      template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/e33f01e3/linux_release.x86_64
+      editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/f2020817/MirrorGodotEditorLinux.x86_64
+      template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/f2020817/linux_release.x86_64
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -37,7 +37,7 @@ jobs:
       editor-binary-name: MirrorGodotEditorWindows.exe
       editor-binary-download: MirrorGodotEditorWindows.exe
       editor-binary-branch: dev
-      editor-template-directory: ~/AppData/Roaming/Godot/export_templates/4.3.dev
+      editor-template-directory: ~/AppData/Roaming/Godot/export_templates/4.3.beta
       template-binary-workflow: deployment.yml
       template-binary-name: windows_release_x86_64.exe
       template-binary-branch: themirror
@@ -65,7 +65,7 @@ jobs:
       editor-binary-download: MirrorGodotEditorMac.app.zip
       editor-binary-name: MirrorGodotEditorMac.app/Contents/MacOS/Godot
       editor-binary-branch: themirror
-      editor-template-directory: ~/Library/Application\ Support/Godot/export_templates/4.3.dev
+      editor-template-directory: ~/Library/Application\ Support/Godot/export_templates/4.3.beta
       template-binary-workflow: deployment.yml
       template-binary-name: macos_template.app.zip
       template-binary-branch: dev
@@ -91,7 +91,7 @@ jobs:
       editor-binary-name: MirrorGodotEditorLinux.x86_64
       editor-binary-download: MirrorGodotEditorLinux.x86_64
       editor-binary-branch: dev
-      editor-template-directory: ~/.local/share/godot/export_templates/4.3.dev
+      editor-template-directory: ~/.local/share/godot/export_templates/4.3.beta
       template-binary-workflow: deployment.yml
       template-binary-name: linux_release.x86_64
       template-binary-branch: themirror
@@ -100,6 +100,6 @@ jobs:
       game-export-preset: Linux
       game-binary-name: The Mirror Dev.x86_64
       bucket-name: no-bucket
-      os: ${{ github.event.repository.name != 'the-mirror' && 'linux-mirror' || 'ubuntu-20.04' }}
+      os: ${{ github.event.repository.name != 'the-mirror' && 'linux-mirror' || 'ubuntu-22.04' }}
       editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/${{needs.get-or-build-engine.outputs.commit_hash}}/MirrorGodotEditorLinux.x86_64
       template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/${{needs.get-or-build-engine.outputs.commit_hash}}/linux_release.x86_64
diff --git a/.github/workflows/engine.yml b/.github/workflows/engine.yml
@@ -278,7 +278,7 @@ jobs:
           path: ./godot-engine/bin/${{ matrix.artifact-name }}.zip
           destination: ${{ matrix.bucket-name }}/${{steps.vars.outputs.sha_short}}/
   build-linux:
-    runs-on: ${{ inputs.self-hosted-runner && 'linux-mirror' || 'ubuntu-20.04' }}
+    runs-on: ${{ inputs.self-hosted-runner && 'linux-mirror' || 'ubuntu-22.04' }}
     name: ${{ matrix.name }}
     environment: ${{ inputs.environment }}
     strategy:
@@ -288,7 +288,7 @@ jobs:
           - name: Linux Editor
             cache-name: linux-editor
             target: editor
-            sconsflags: arch=x86_64 debug_symbols=no optimize=speed production=yes
+            sconsflags: arch=x86_64 debug_symbols=yes optimize=speed_trace
             strip: false
             bin: "./bin/godot.linuxbsd.editor.x86_64"
             artifact-name: "MirrorGodotEditorLinux.x86_64"
@@ -312,6 +312,12 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Check versions of the compiler
+        run: |
+          ldd --version
+          gcc --version
+          cmake --version
+
       - name: Get short commit hash
         id: vars
         run: |

diff --git a/.github/workflows/web-server-build-check.yml b/.github/workflows/web-server-build-check.yml
@@ -0,0 +1,37 @@
+name: Build-Check
+
+on:
+  push:
+    branches: [dev]
+    paths:
+      - "mirror-web-server/**"
+  pull_request:
+    branches: [dev]
+    paths:
+      - "mirror-web-server/**"
+
+jobs:
+  # This runs the same command as GCP build but is far faster since it doesn't deploy to Cloud Run. Can be useful for debugging
+  Build-Command:
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: mirror-web-server
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: "yarn"
+          cache-dependency-path: mirror-web-server/yarn.lock
+
+      - run: yarn install --frozen-lockfile
+      - run: yarn gcp-build
diff --git a/.github/workflows/web-server-tests.yml b/.github/workflows/web-server-tests.yml
@@ -0,0 +1,64 @@
+# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+name: Tests
+
+on:
+  push:
+    branches: [dev]
+    paths:
+      - "mirror-web-server/**"
+  pull_request:
+    branches: [dev]
+    paths:
+      - "mirror-web-server/**"
+
+jobs:
+  Unit:
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: mirror-web-server
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: "yarn"
+          cache-dependency-path: mirror-web-server/yarn.lock
+
+      - run: yarn install --frozen-lockfile
+      - run: yarn lint:ci
+      - run: yarn test:ci
+
+  Integration:
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: mirror-web-server
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: "yarn"
+          cache-dependency-path: mirror-web-server/yarn.lock
+
+      - run: yarn install --frozen-lockfile
+      - run: yarn lint:ci
+      - run: yarn test:int:ci
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ node_modules
 *.arm64
 *.app/
 *.app.zip
+.vercel