From d5297d1b716eab6f6532f15203105094cd593526 Mon Sep 17 00:00:00 2001 From: Gordon MacPherson Date: Thu, 6 Jun 2024 18:38:27 +0100 Subject: [PATCH] Fix editor version and download links (#198) * Fix editor version and download links * Update download links in readme.md * Fix editor URL in the CICD --- .github/workflows/deployment-pr.yml | 12 ++++++------ README.md | 6 +++--- mirror-godot-app/project.godot | 2 +- setup-linux.sh | 5 +++-- setup-mac.sh | 4 ++-- setup-win.sh | 4 ++-- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.github/workflows/deployment-pr.yml b/.github/workflows/deployment-pr.yml index 31109c4e..2011a227 100644 --- 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/353b6bf1/MirrorGodotEditorWindows.exe - template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/353b6bf1/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 @@ -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/353b6bf1/MirrorGodotEditorMac.app.zip - template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/353b6bf1/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 @@ -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/353b6bf1/MirrorGodotEditorLinux.x86_64 - template-download-url: https://storage.googleapis.com/mirror_native_client_builds/Engine/353b6bf1/linux_release.x86_64 \ No newline at end of file + 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 \ No newline at end of file diff --git a/README.md b/README.md index 68ecfae0..c63ef022 100644 --- 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/e33f01e3/MirrorGodotEditorWindows.exe) -- Mac: **v buggy**; taking contributions for fixes :) [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/e33f01e3/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/e33f01e3/MirrorGodotEditorLinux.x86_64) +- Windows: [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/f2020817/MirrorGodotEditorWindows.exe) +- Mac: **v buggy**; taking contributions for fixes :) [Download](https://storage.googleapis.com/mirror_native_client_builds/Engine/f2020817/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/f2020817/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/mirror-godot-app/project.godot b/mirror-godot-app/project.godot index 14ab24fb..26392bec 100644 --- 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("4.3", "353b6bf1", "mirror") +config/features=PackedStringArray("4.3", "f2020817", "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 index 3bec8f53..fcde1ddf 100755 --- a/setup-linux.sh +++ b/setup-linux.sh @@ -1,3 +1,4 @@ #!/bin/bash -curl -o "MirrorGodotEditorLinux.x86_64" "https://storage.googleapis.com/mirror_native_client_builds/Engine/latest-editor/MirrorGodotEditorLinux.x86_64.zip" -echo "If you do not have wget installed, you can install it or download from here https://storage.googleapis.com/mirror_native_client_builds/Engine/latest-editor/MirrorGodotEditorLinux.x86_64.zip" \ No newline at end of file +https://storage.googleapis.com/mirror_native_client_builds/Engine/353b6bf1/MirrorGodotEditorLinux.x86_64.zip +curl -o "MirrorGodotEditorLinux.x86_64" "https://storage.googleapis.com/mirror_native_client_builds/Engine/f2020817/MirrorGodotEditorLinux.x86_64" +echo "If you do not have curl installed, you can install it or download from here https://storage.googleapis.com/mirror_native_client_builds/Engine/f2020817/MirrorGodotEditorLinux.x86_64" diff --git a/setup-mac.sh b/setup-mac.sh index b0b804c6..a728175d 100755 --- a/setup-mac.sh +++ b/setup-mac.sh @@ -1,3 +1,3 @@ #!/bin/bash -curl -o "MirrorGodotEditorMac.app.zip" "https://storage.googleapis.com/mirror_native_client_builds/Engine/latest-editor/MirrorGodotEditorMac.app.zip.zip" -echo "If you do not have curl installed, you can install it or download from here https://storage.googleapis.com/mirror_native_client_builds/Engine/latest-editor/MirrorGodotEditorMac.app.zip.zip" \ No newline at end of file +curl -o "MirrorGodotEditorMac.app.zip" "https://storage.googleapis.com/mirror_native_client_builds/Engine/f2020817/MirrorGodotEditorMac.app.zip" +echo "If you do not have curl installed, you can install it or download from here https://storage.googleapis.com/mirror_native_client_builds/Engine/f2020817/MirrorGodotEditorMac.app.zip" diff --git a/setup-win.sh b/setup-win.sh index ee2d3b08..d5f943c2 100755 --- a/setup-win.sh +++ b/setup-win.sh @@ -1,3 +1,3 @@ #!/bin/bash -curl -o "MirrorGodotEditorWindows.exe" "https://storage.googleapis.com/mirror_native_client_builds/Engine/latest-editor/MirrorGodotEditorWindows.exe.zip" -echo "If you do not have curl installed, you can install it or download from here https://storage.googleapis.com/mirror_native_client_builds/Engine/latest-editor/MirrorGodotEditorWindows.exe.zip" \ No newline at end of file +curl -o "MirrorGodotEditorWindows.exe" "https://storage.googleapis.com/mirror_native_client_builds/Engine/f2020817/MirrorGodotEditorWindows.exe" +echo "If you do not have curl installed, you can install it or download from here https://storage.googleapis.com/mirror_native_client_builds/Engine/f2020817/MirrorGodotEditorWindows.exe"