From e321eca2bfe422abdf015e1aecea4869b5a4bcff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 28 Feb 2024 10:21:27 +0100 Subject: [PATCH] Web: Tweak build concurrency, doesn't seem to work with all in parallel --- build-web/build.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/build-web/build.sh b/build-web/build.sh index a10982e..0d85602 100755 --- a/build-web/build.sh +++ b/build-web/build.sh @@ -45,14 +45,6 @@ if [ "${CLASSICAL}" == "1" ]; then pids[$i]=$! done - for i in {0..3}; do - cp -r /root/godot /root/godot-nothreads$i - cd /root/godot-nothreads$i - echo "$SCONS platform=web ${OPTIONS} ${JOBS_NOTHREADS[$i]}" - $SCONS platform=web ${OPTIONS} ${JOBS_NOTHREADS[$i]} & - pids_nothreads[$i]=$! - done - cd /root/godot echo "$SCONS platform=web ${OPTIONS} target=editor use_closure_compiler=yes" $SCONS platform=web ${OPTIONS} target=editor use_closure_compiler=yes & @@ -61,13 +53,20 @@ if [ "${CLASSICAL}" == "1" ]; then for pid in ${pids[*]}; do wait $pid done + wait $pid_editor + + for i in {0..3}; do + cp -r /root/godot /root/godot-nothreads$i + cd /root/godot-nothreads$i + echo "$SCONS platform=web ${OPTIONS} ${JOBS_NOTHREADS[$i]}" + $SCONS platform=web ${OPTIONS} ${JOBS_NOTHREADS[$i]} & + pids_nothreads[$i]=$! + done for pid in ${pids_nothreads[*]}; do wait $pid done - wait $pid_editor - mkdir -p /root/out/tools cp -rvp /root/godot/bin/*.editor*.zip /root/out/tools