fix: manual build not working for Godot v4.1+

poingstudios · Jul 30, 2023 · 5ac7bf3 · 5ac7bf3
1 parent 5a44b32
commit 5ac7bf3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/.github/workflows/manual_release_ios.yml b/.github/workflows/manual_release_ios.yml
@@ -90,14 +90,7 @@ jobs:
       env:
         SCONS_CACHE: ${{github.workspace}}/godot-${{env.CURRENT_GODOT_VERSION}}-stable/.scons_cache/
       run: |
-        VERSION_TO_BUILD=0
-
-        if [ ${CURRENT_GODOT_VERSION:0:1} -gt 3 ]
-        then
-            VERSION_TO_BUILD=${CURRENT_GODOT_VERSION:0:3}
-        else
-            VERSION_TO_BUILD=${CURRENT_GODOT_VERSION:0:1}.x
-        fi
+        VERSION_TO_BUILD=${CURRENT_GODOT_VERSION:0:1}.x
         
         ./scripts/release_static_library.sh ${VERSION_TO_BUILD}
 

diff --git a/.github/workflows/release_ios_v3_3+.yml b/.github/workflows/release_ios_v3_3+.yml
@@ -117,14 +117,7 @@ jobs:
       env:
         SCONS_CACHE: ${{github.workspace}}/godot-${{env.CURRENT_GODOT_VERSION}}-stable/.scons_cache/
       run: |
-        VERSION_TO_BUILD=0
-
-        if [ ${CURRENT_GODOT_VERSION:0:1} -gt 3 ]
-        then
-            VERSION_TO_BUILD=${CURRENT_GODOT_VERSION:0:3}
-        else
-            VERSION_TO_BUILD=${CURRENT_GODOT_VERSION:0:1}.x
-        fi
+        VERSION_TO_BUILD=${CURRENT_GODOT_VERSION:0:1}.x
         
         ./scripts/release_static_library.sh ${VERSION_TO_BUILD}
 

diff --git a/SConstruct b/SConstruct
@@ -25,7 +25,7 @@ opts.Add(BoolVariable('simulator', "Compilation platform", 'no'))
 opts.Add(BoolVariable('use_llvm', "Use the LLVM / Clang compiler", 'no'))
 opts.Add(PathVariable('target_path', 'The path where the lib is installed.', 'bin/'))
 opts.Add(EnumVariable('plugin', 'Plugin to build', '', ['', 'admob']))
-opts.Add(EnumVariable('version', 'Godot version to target', '', ['', '3.x', '4.0']))
+opts.Add(EnumVariable('version', 'Godot version to target', '', ['', '3.x', '4.x']))
 
 # Updates the environment with the option variables.
 opts.Update(env)