build: use godot 4.3-dev2

MechanicalFlower · Jan 13, 2024 · 3857a62 · 3857a62
1 parent c85610c
commit 3857a62
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/.env b/.env
@@ -2,7 +2,7 @@
 
 # Godot
 
-GODOT_VERSION=4.2.1
+GODOT_VERSION=4.3-dev2
 
 # Game
 

diff --git a/.github/renovate.json b/.github/renovate.json
@@ -28,7 +28,7 @@
       "depNameTemplate": "godotengine/godot",
       "packageNameTemplate": "https://github.com/godotengine/godot",
       "versioningTemplate": "loose",
-      "extractVersionTemplate": "^(?<version>.*)-stable$",
+      "extractVersionTemplate": "^(?<version>.*)$",
       "datasourceTemplate": "git-tags"
     }
   ]

diff --git a/.github/workflows/release-packaging.yml b/.github/workflows/release-packaging.yml
@@ -55,7 +55,7 @@ jobs:
         with:
           path: |
             ~/.mkflower/bin
-            ~/.local/share/godot/export_templates/${{ env.godot_version }}.stable
+            ~/.local/share/godot/export_templates
           key: ${{ env.godot_version }}
 
       - name: Export
@@ -87,7 +87,7 @@ jobs:
         with:
           path: |
             ~/.mkflower/bin
-            ~/.local/share/godot/export_templates/${{ env.godot_version }}.stable
+            ~/.local/share/godot/export_templates
           key: ${{ env.godot_version }}
 
       - name: Load dotenv

diff --git a/Justfile b/Justfile
@@ -48,7 +48,6 @@ godot_filename := "Godot_v" + godot_version + "-stable_" + godot_platform
 godot_template := "Godot_v" + godot_version + "-stable_export_templates.tpz"
 godot_bin := bin_dir / godot_filename
 godot_editor_data_dir := "~/.local/share/godot/"
-use_x11_wrapper := if godot_platform =~ "x11*" { env("CI", "false") } else { "false" }
 
 # Game variables
 game_name := env_var('GAME_NAME')
@@ -92,8 +91,8 @@ install-godot:
     #!/usr/bin/env sh
     if [ ! -e {{ godot_bin }} ]
     then
-        curl -X GET "https://downloads.tuxfamily.org/godotengine/{{ godot_version }}/{{ godot_filename }}.zip" --output {{ cache_dir }}/{{ godot_filename }}.zip
-        unzip {{ cache_dir }}/{{ godot_filename }}.zip -d {{ cache_dir }}
+        curl -X GET "https://github.com/godotengine/godot-builds/releases/download/{{ godot_version }}/{{ godot_filename }}.zip" --output {{ cache_dir }}/{{ godot_filename }}.zip
+        unzip -o {{ cache_dir }}/{{ godot_filename }}.zip -d {{ cache_dir }}
         cp {{ cache_dir }}/{{ godot_filename }} {{ godot_bin }}
     fi
 
@@ -103,8 +102,8 @@ install-templates:
     #!/usr/bin/env sh
     if [ ! -d {{ godot_editor_data_dir }}/export_templates/{{ godot_version }}.stable ]
     then
-        curl -X GET "https://downloads.tuxfamily.org/godotengine/{{ godot_version }}/{{ godot_template }}" --output {{ cache_dir }}/{{ godot_template }}
-        unzip {{ cache_dir }}/{{ godot_template }} -d {{ cache_dir }}
+        curl -X GET "https://github.com/godotengine/godot-builds/releases/download/{{ godot_version }}/{{ godot_template }}" --output {{ cache_dir }}/{{ godot_template }}
+        unzip -o {{ cache_dir }}/{{ godot_template }} -d {{ cache_dir }}
         mkdir -p {{ godot_editor_data_dir }}/export_templates/{{ godot_version }}.stable
         cp {{ cache_dir }}/templates/* {{ godot_editor_data_dir }}/export_templates/{{ godot_version }}.stable
     fi
@@ -205,7 +204,7 @@ install-butler: makedirs
     if [ ! -e {{ butler_bin }} ]
     then
         curl -L -X GET "https://broth.itch.ovh/butler/{{ butler_platform }}/LATEST/archive/default" --output {{ cache_dir }}/butler.zip
-        unzip {{ cache_dir }}/butler.zip -d {{ cache_dir }}
+        unzip -o {{ cache_dir }}/butler.zip -d {{ cache_dir }}
         mv {{ cache_dir }}/butler {{ butler_bin }}
         chmod +x {{ butler_bin }}
     fi
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     # Godot
-    GODOT_VERSION=4.2.1
+    GODOT_VERSION=4.3-dev2
     # Game
@@ Expand Down @@