Merge pull request #48 from dragonhunt02/web-debug-patch

Fix web template_debug Github build error
V-Sekai · Jan 17, 2025 · d472c2e · d472c2e
2 parents b8fb6a9 + 01a036b
commit d472c2e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -186,12 +186,16 @@ jobs:
         run: | 
           just install_packages 
           export PLATFORM_ARGS=""
+          export EXTRA_OPTIONS=""
           case "${{ matrix.platform }}" in  
             android)  
               PLATFORM_ARGS="fetch-openjdk setup-android-sdk"  
               ;;  
             web)  
-              PLATFORM_ARGS="setup-emscripten"  
+              PLATFORM_ARGS="setup-emscripten"
+              if [ ${{ matrix.target }} == 'template_debug' ]; then
+                  EXTRA_OPTIONS="optimize=none"; # Fix Github runner out of RAM
+              fi
               ;;  
             windows)  
               PLATFORM_ARGS="fetch-llvm-mingw"  
@@ -206,7 +210,7 @@ jobs:
           if "${{ matrix.architecture == 'arm64' }}"; then
               PLATFORM_ARGS="setup-arm64 $PLATFORM_ARGS"
           fi
-          hyperfine --show-output --runs 1 'just $PLATFORM_ARGS && just build-platform-target ${{ matrix.platform }} ${{ matrix.target }} ${{ matrix.architecture }} ${{ matrix.precision }}'
+          hyperfine --show-output --runs 1 'just $PLATFORM_ARGS && just build-platform-target ${{ matrix.platform }} ${{ matrix.target }} ${{ matrix.architecture }} ${{ matrix.precision }} yes $EXTRA_OPTIONS'
 
       - name: Upload Android Editors
         if: ${{ matrix.platform == 'android' && matrix.target == 'editor' }}

diff --git a/Justfile b/Justfile
@@ -169,7 +169,7 @@ generate_build_constants:
     echo "const BUILD_DATE_STR = \"$(shell date --utc --iso=seconds)\"" >> v/addons/vsk_version/build_constants.gd
     echo "const BUILD_UNIX_TIME = $(shell date +%s)" >> v/addons/vsk_version/build_constants.gd
 
-build-platform-target platform target arch="auto" precision="double" osx_bundle="yes":
+build-platform-target platform target arch="auto" precision="double" osx_bundle="yes" extra_options="":
     #!/usr/bin/env bash
     set -o xtrace
     cd $WORLD_PWD
@@ -197,7 +197,8 @@ build-platform-target platform target arch="auto" precision="double" osx_bundle=
                     osxcross_sdk=darwin24 \
                     generate_bundle={{osx_bundle}} \
                     debug_symbols=yes \
-                    separate_debug_symbols=yes
+                    separate_debug_symbols=yes \
+                    {{extra_options}}
             ;;
         windows)
             scons platform=windows \
@@ -210,7 +211,8 @@ build-platform-target platform target arch="auto" precision="double" osx_bundle=
                 use_llvm=yes \
                 use_mingw=yes \
                 debug_symbols=yes \
-                separate_debug_symbols=yes
+                separate_debug_symbols=yes \
+                {{extra_options}}
             ;;
         android)
             scons platform=android \
@@ -220,6 +222,7 @@ build-platform-target platform target arch="auto" precision="double" osx_bundle=
                     precision={{precision}} \
                     target={{target}} \
                     test=yes \
+                    {{extra_options}} \
                     #debug_symbols=yes    # Editor build runs out of space in Github Runner
             ;;
         linuxbsd)
@@ -231,7 +234,8 @@ build-platform-target platform target arch="auto" precision="double" osx_bundle=
                     target={{target}} \
                     test=yes \
                     debug_symbols=yes \
-                    separate_debug_symbols=yes
+                    separate_debug_symbols=yes \
+                    {{extra_options}}
             ;;
         web)
             scons platform=web \
@@ -242,7 +246,8 @@ build-platform-target platform target arch="auto" precision="double" osx_bundle=
                     target={{target}} \
                     test=yes \
                     dlink_enabled=yes \
-                    debug_symbols=yes
+                    debug_symbols=yes \
+                    {{extra_options}}
             ;;
         ios)
             if [ "$(uname)" = "Darwin" ]; then
@@ -262,7 +267,8 @@ build-platform-target platform target arch="auto" precision="double" osx_bundle=
                     osxcross_sdk=darwin24 \
                     generate_bundle={{osx_bundle}} \
                     debug_symbols=yes \
-                    separate_debug_symbols=yes
+                    separate_debug_symbols=yes \
+                    {{extra_options}}
             ;;
         *)
             echo "Unsupported platform: {{platform}}"