Cherrypick engine update with working macos installer from 74df6f1

bruzvg from godot has fixed this issue already we just cherrypicked his work all macos build were broken by cicd/macos changes.
the-mirror-gdp · Oct 11, 2024 · be4a4be · be4a4be
1 parent ba5aa3b
commit be4a4be
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/deployment-pr.yml b/.github/workflows/deployment-pr.yml
@@ -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/2ed330c2/MirrorGodotEditorWindows.exe
-      template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/windows_release_x86_64.exe
+      editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/6a1210ed/MirrorGodotEditorWindows.exe
+      template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/6a1210ed/windows_release_x86_64.exe
   build-macos-client:
     name: 🍎 Build MacOS Dev PR
     uses: ./.github/workflows/client-build-tool.yml
@@ -59,10 +59,10 @@ jobs:
       game-export-preset: MacOS-themirror-dev
       game-binary-name: The Mirror Dev.app
       bucket-name: no-bucket
-      os: ${{ github.event.repository.name != 'the-mirror' && 'macos-mirror' || 'macos-13' }}
+      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/2ed330c2/MirrorGodotEditorMac.app.zip
-      template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/macos_template.app.zip
+      editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/6a1210ed/MirrorGodotEditorMac.app.zip
+      template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/6a1210ed/macos_template.app.zip
   build-linux-client:
     name: 🐧 Build Linux Dev PR
     uses: ./.github/workflows/client-build-tool.yml
@@ -85,5 +85,5 @@ jobs:
       bucket-name: no-bucket
       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/2ed330c2/MirrorGodotEditorLinux.x86_64
-      template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/linux_release.x86_64
+      editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/6a1210ed/MirrorGodotEditorLinux.x86_64
+      template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/6a1210ed/linux_release.x86_64
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -74,7 +74,7 @@ jobs:
       game-export-preset: MacOS-themirror-dev
       game-binary-name: The Mirror Dev.app
       bucket-name: no-bucket
-      os: ${{ github.event.repository.name != 'the-mirror' && 'macos-mirror' || 'macos-13' }}
+      os: ${{ github.event.repository.name != 'the-mirror' && 'macos-mirror' || 'macos-latest' }}
       editor-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/${{needs.get-or-build-engine.outputs.commit_hash}}/MirrorGodotEditorMac.app.zip
       template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/${{needs.get-or-build-engine.outputs.commit_hash}}/macos_template.app.zip
   build-linux-client:

diff --git a/.github/workflows/engine.yml b/.github/workflows/engine.yml
@@ -143,7 +143,7 @@ jobs:
           path: ./godot-engine/bin/${{ matrix.artifact-name }}.exe
           destination: ${{ matrix.bucket-name }}/${{steps.vars.outputs.sha_short}}/
   build-macos:
-    runs-on: ${{ inputs.self-hosted-runner && 'macos-mirror' || 'macos-13' }}
+    runs-on: ${{ inputs.self-hosted-runner && 'macos-mirror' || 'macos-latest' }}
     name: ${{ matrix.name }}
     environment: ${{ inputs.environment }}
     strategy:

diff --git a/README.md b/README.md
@@ -60,9 +60,9 @@ This repo is The Mirror's source code: the Godot app (client/server), the web se
 1. Git clone the repository (you do **not** need to clone with submodules; they are optional)
 2. Download the precompiled Mirror fork of Godot engine (required to use)
 
-- Windows: [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/MirrorGodotEditorWindows.exe)
-- Mac: **v buggy**; taking contributions for fixes :) [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/MirrorGodotEditorMac.app.zip). On Mac you will see a zip file; extract it and open the editor binary with CMD + Right-Click then select the Open option.
-- Linux: [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/MirrorGodotEditorLinux.x86_64)
+- Windows: [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/6a1210ed/MirrorGodotEditorWindows.exe)
+- Mac: **v buggy**; taking contributions for fixes :) [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/6a1210ed/MirrorGodotEditorMac.app.zip). On Mac you will see a zip file; extract it and open the editor binary with CMD + Right-Click then select the Open option.
+- Linux: [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/6a1210ed/MirrorGodotEditorLinux.x86_64)
 
 1. Open the Godot editor (The Mirror fork), click import, and choose the `project.godot` from the `/mirror-godot-app` folder.
    Note that if you see this popup, you can safely ignore it and proceed.

diff --git a/godot-engine b/godot-engine
diff --git a/mirror-godot-app/project.godot b/mirror-godot-app/project.godot
@@ -82,7 +82,7 @@ global_script_class_icons={
 config/name="The Mirror"
 config/tags=PackedStringArray("open_source")
 run/main_scene="res://scenes/boot_scene.tscn"
-config/features=PackedStringArray("2ed330c2", "4.3", "mirror")
+config/features=PackedStringArray("6a1210ed", "4.3", "mirror")
 boot_splash/bg_color=Color(0.0745098, 0.0862745, 0.184314, 1)
 boot_splash/image="res://art/white_logo_slate_bg_with_text.png"
 boot_splash/fullsize=false

diff --git a/setup-linux.sh b/setup-linux.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-curl -o "MirrorGodotEditorLinux.x86_64" "https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/MirrorGodotEditorLinux.x86_64"
+curl -o "MirrorGodotEditorLinux.x86_64" "https://storage.googleapis.com/mirror_native_client_builds/Engine/6a1210ed/MirrorGodotEditorLinux.x86_64"
diff --git a/setup-mac.sh b/setup-mac.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-curl -o "MirrorGodotEditorMac.app.zip" "https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/MirrorGodotEditorMac.app.zip"
+curl -o "MirrorGodotEditorMac.app.zip" "https://storage.googleapis.com/mirror_native_client_builds/Engine/6a1210ed/MirrorGodotEditorMac.app.zip"
diff --git a/setup-win.sh b/setup-win.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-curl -o "MirrorGodotEditorWindows.exe" "https://storage.googleapis.com/mirror_native_client_builds/Engine/2ed330c2/MirrorGodotEditorWindows.exe"
+curl -o "MirrorGodotEditorWindows.exe" "https://storage.googleapis.com/mirror_native_client_builds/Engine/6a1210ed/MirrorGodotEditorWindows.exe"