Skip to content

Commit ac8a87c

Browse files
committed
Fix build failures for Android, Windows, and Linux platforms
- Only source Emscripten SDK for web platform builds to prevent Android failures - Add D3D12 dependency installation for Windows cross-compilation with MinGW - Disable debug symbols for Linux editor builds in CI to prevent disk space errors
1 parent d315c3c commit ac8a87c

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ jobs:
195195
fi
196196
;;
197197
windows)
198-
PLATFORM_ARGS="fetch-llvm-mingw"
198+
PLATFORM_ARGS="fetch-llvm-mingw setup-d3d12"
199199
;;
200200
macos)
201201
PLATFORM_ARGS="build-osxcross fetch-vulkan-sdk"

Justfile

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,13 @@ fetch-llvm-mingw:
6161
rm -rf llvm-mingw.tar.xz
6262
fi
6363

64+
setup-d3d12:
65+
#!/usr/bin/env bash
66+
cd $WORLD_PWD/godot
67+
if [ ! -d "bin/build_deps/mesa" ] || [ ! -d "bin/build_deps/agility_sdk" ]; then
68+
python3 misc/scripts/install_d3d12_sdk_windows.py --mingw_prefix=${MINGW_PREFIX}
69+
fi
70+
6471
fetch-openjdk:
6572
#!/usr/bin/env bash
6673
if [ ! -d "${JAVA_HOME}" ]; then
@@ -163,7 +170,9 @@ build-platform-target platform target arch="auto" precision="double" osx_bundle=
163170
#!/usr/bin/env bash
164171
set -o xtrace
165172
cd $WORLD_PWD
166-
source "$EMSDK_ROOT/emsdk_env.sh"
173+
if [[ "{{platform}}" == "web" && -d "$EMSDK_ROOT" ]]; then
174+
source "$EMSDK_ROOT/emsdk_env.sh"
175+
fi
167176
HOST_ARCH=$( uname -m )
168177
echo "HOST ARCHITECTURE: ${HOST_ARCH}"
169178
if [[ "{{arch}}" == "arm64" && ${HOST_ARCH} == 'x86_64' ]]; then
@@ -219,15 +228,21 @@ build-platform-target platform target arch="auto" precision="double" osx_bundle=
219228
#debug_symbols=yes # Editor build runs out of space in Github Runner
220229
;;
221230
linuxbsd)
231+
DEBUG_SYMBOLS=""
232+
if [[ "$(just is-github-actions)" == "true" && "{{target}}" == "editor" ]]; then
233+
# Disable debug symbols for editor builds in CI to save disk space
234+
DEBUG_SYMBOLS="debug_symbols=no"
235+
else
236+
DEBUG_SYMBOLS="debug_symbols=yes separate_debug_symbols=yes"
237+
fi
222238
scons platform=linuxbsd \
223239
arch={{arch}} \
224240
werror=no \
225241
compiledb=yes \
226242
precision={{precision}} \
227243
target={{target}} \
228244
test=yes \
229-
debug_symbols=yes \
230-
separate_debug_symbols=yes \
245+
$DEBUG_SYMBOLS \
231246
{{extra_options}}
232247
;;
233248
web)

0 commit comments

Comments
 (0)