Merge pull request #2 from jss2a98aj/cleanup-scons-flags

Cleanup some scons flags
blazium-engine · Nov 25, 2024 · 580c0e9 · 580c0e9
2 parents e51f11e + 85b036d
commit 580c0e9
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml
@@ -27,12 +27,11 @@ on:
         required: true
         type: string
 
-
 # Global Settings
 env:
   # Used for the cache key. Add version suffix to force clean build.
   GODOT_BASE_BRANCH: blazium-dev
-  SCONSFLAGS: verbose=yes warnings=no werror=no debug_symbols=no progress=no generate_apk=yes module_text_server_fb_enabled=yes
+  SCONSFLAGS: verbose=yes warnings=no progress=no
   BUILD_FLAG: ${{ github.event.client_payload.production && 'production=yes' || 'use_static_cpp=yes' }}
   TEMPLATE_TYPE: ${{ github.event.client_payload.production && 'template_release' || 'template_debug' }}
   BUILD_TYPE: ${{ github.event.client_payload.type || 'nightly' }}

diff --git a/.github/workflows/ios_builds.yml b/.github/workflows/ios_builds.yml
@@ -31,7 +31,7 @@ on:
 env:
   # Used for the cache key. Add version suffix to force clean build.
   GODOT_BASE_BRANCH: blazium-dev
-  SCONSFLAGS: verbose=yes warnings=no werror=no debug_symbols=no progress=no module_text_server_fb_enabled=yes strict_checks=yes
+  SCONSFLAGS: verbose=yes warnings=no progress=no
   TERM: xterm
   DEPLOY_TYPE: ios
 

diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
@@ -31,7 +31,7 @@ on:
 env:
   # Used for the cache key. Add version suffix to force clean build.
   GODOT_BASE_BRANCH: blazium-dev
-  SCONSFLAGS: verbose=yes warnings=no werror=no debug_symbols=no progress=no module_text_server_fb_enabled=yes
+  SCONSFLAGS: verbose=yes warnings=no progress=no
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
   TSAN_OPTIONS: suppressions=misc/error_suppressions/tsan.txt

diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml
@@ -31,7 +31,7 @@ on:
 env:
   # Used for the cache key. Add version suffix to force clean build.
   GODOT_BASE_BRANCH: blazium-dev
-  SCONSFLAGS: verbose=yes warnings=no werror=no debug_symbols=no progress=no
+  SCONSFLAGS: verbose=yes warnings=no progress=no
   DEPLOY_TYPE: macos
 
 concurrency:

diff --git a/.github/workflows/mono_glue_build.yml b/.github/workflows/mono_glue_build.yml
@@ -31,7 +31,7 @@ on:
 env:
   # Used for the cache key. Add version suffix to force clean build.
   GODOT_BASE_BRANCH: blazium-dev
-  SCONSFLAGS: verbose=yes warnings=no werror=no debug_symbols=no progress=no use_static_cpp=no
+  SCONSFLAGS: verbose=yes warnings=no progress=no use_static_cpp=no
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
   TSAN_OPTIONS: suppressions=misc/error_suppressions/tsan.txt

diff --git a/.github/workflows/web_builds.yml b/.github/workflows/web_builds.yml
@@ -31,7 +31,7 @@ on:
 env:
   # Used for the cache key. Add version suffix to force clean build.
   GODOT_BASE_BRANCH: blazium-dev
-  SCONSFLAGS: verbose=yes warnings=no werror=no debug_symbols=no progress=no
+  SCONSFLAGS: verbose=yes warnings=no progress=no
   EM_VERSION: 3.1.64
   EM_CACHE_FOLDER: "emsdk-cache"
   DEPLOY_TYPE: web-editor

diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
@@ -32,7 +32,7 @@ on:
 env:
   # Used for the cache key. Add version suffix to force clean build.
   GODOT_BASE_BRANCH: blazium-dev
-  SCONSFLAGS: verbose=yes warnings=no werror=no debug_symbols=no progress=no module_text_server_fb_enabled=yes # d3d12=yes  "mesa_libs=${{github.workspace}}/deps/mesa" "angle_libs=${{github.workspace}}/deps/angle"
+  SCONSFLAGS: verbose=yes warnings=no progress=no # d3d12=yes  "mesa_libs=${{github.workspace}}/deps/mesa" "angle_libs=${{github.workspace}}/deps/angle"
   SCONS_CACHE_MSVC_CONFIG: true
   DEPLOY_TYPE: windows