Skip to content

Commit

Permalink
git subrepo pull (merge) --force --branch=groups-4.4.2024-12-12T20554…
Browse files Browse the repository at this point in the history
…0Z godot

subrepo:
  subdir:   "godot"
  merged:   "a23968f336"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-4.4.2024-12-12T205540Z"
  commit:   "a23968f336"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "cce3d93"
  • Loading branch information
fire committed Dec 12, 2024
1 parent 14ba2e9 commit 34a375e
Show file tree
Hide file tree
Showing 289 changed files with 36,158 additions and 2,707 deletions.
4 changes: 4 additions & 0 deletions godot/.github/workflows/android_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,21 @@ jobs:
target: editor
tests: false
sconsflags: arch=arm64 production=yes swappy=yes
cache-limit: 1

- name: Template arm32 (target=template_release, arch=arm32)
cache-name: android-template-arm32
target: template_release
tests: false
sconsflags: arch=arm32 swappy=yes
cache-limit: 1

- name: Template arm64 (target=template_release, arch=arm64)
cache-name: android-template-arm64
target: template_release
tests: false
sconsflags: arch=arm64 swappy=yes
cache-limit: 1

steps:
- name: Checkout
Expand Down Expand Up @@ -77,6 +80,7 @@ jobs:
platform: android
target: ${{ matrix.target }}
tests: ${{ matrix.tests }}
scons-cache-limit: ${{ matrix.cache-limit }}

- name: Save Godot build cache
uses: ./.github/actions/godot-cache-save
Expand Down
1 change: 1 addition & 0 deletions godot/.github/workflows/ios_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
platform: ios
target: template_release
tests: false
scons-cache-limit: 1

- name: Save Godot build cache
uses: ./.github/actions/godot-cache-save
Expand Down
7 changes: 7 additions & 0 deletions godot/.github/workflows/linux_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
proj-conv: true
api-compat: true
artifact: true
cache-limit: 1

- name: Editor with doubles and GCC sanitizers (target=editor, tests=yes, dev_build=yes, scu_build=yes, precision=double, use_asan=yes, use_ubsan=yes, linker=gold)
cache-name: linux-editor-double-sanitizers
Expand All @@ -49,6 +50,7 @@ jobs:
api-dump: true
# Skip 2GiB artifact speeding up action.
artifact: false
cache-limit: 7

- name: Editor with clang sanitizers (target=editor, tests=yes, dev_build=yes, use_asan=yes, use_ubsan=yes, use_llvm=yes, linker=lld)
cache-name: linux-editor-llvm-sanitizers
Expand All @@ -61,6 +63,7 @@ jobs:
artifact: false
# Test our oldest supported SCons/Python versions on one arbitrary editor build.
legacy-scons: true
cache-limit: 7

- name: Editor with ThreadSanitizer (target=editor, tests=yes, dev_build=yes, use_tsan=yes, use_llvm=yes, linker=lld)
cache-name: linux-editor-thread-sanitizer
Expand All @@ -71,6 +74,7 @@ jobs:
build-mono: false
# Skip 2GiB artifact speeding up action.
artifact: false
cache-limit: 5

- name: Template w/ Mono (target=template_release, tests=yes)
cache-name: linux-template-mono
Expand All @@ -80,6 +84,7 @@ jobs:
build-mono: false
tests: true
artifact: true
cache-limit: 1

- name: Minimal template (target=template_release, tests=yes, everything disabled)
cache-name: linux-template-minimal
Expand All @@ -88,6 +93,7 @@ jobs:
bin: ./bin/godot.linuxbsd.template_release.x86_64
tests: true
artifact: true
cache-limit: 1

steps:
- name: Checkout
Expand Down Expand Up @@ -140,6 +146,7 @@ jobs:
platform: linuxbsd
target: ${{ matrix.target }}
tests: ${{ matrix.tests }}
scons-cache-limit: ${{ matrix.cache-limit }}

- name: Save Godot build cache
uses: ./.github/actions/godot-cache-save
Expand Down
4 changes: 4 additions & 0 deletions godot/.github/workflows/macos_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@ jobs:
target: editor
tests: true
bin: ./bin/godot.macos.editor.universal
cache-limit: 1

- name: Template (target=template_release, tests=yes)
cache-name: macos-template
target: template_release
tests: true
sconsflags: debug_symbols=no
bin: ./bin/godot.macos.template_release.universal
cache-limit: 1

steps:
- name: Checkout
Expand Down Expand Up @@ -59,6 +61,7 @@ jobs:
platform: macos
target: ${{ matrix.target }}
tests: ${{ matrix.tests }}
scons-cache-limit: 0 # Only cap on second run to avoid purging unnecessarily

- name: Compilation (arm64)
uses: ./.github/actions/godot-build
Expand All @@ -67,6 +70,7 @@ jobs:
platform: macos
target: ${{ matrix.target }}
tests: ${{ matrix.tests }}
scons-cache-limit: ${{ matrix.cache-limit }}

- name: Save Godot build cache
uses: ./.github/actions/godot-cache-save
Expand Down
2 changes: 1 addition & 1 deletion godot/.github/workflows/static_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- name: Class reference schema checks
run: |
xmllint --noout --schema doc/class.xsd doc/classes/*.xml modules/*/doc_classes/*.xml platform/*/doc_classes/*.xml
xmllint --quiet --noout --schema doc/class.xsd doc/classes/*.xml modules/*/doc_classes/*.xml platform/*/doc_classes/*.xml
- name: Run C compiler on `gdextension_interface.h`
run: |
Expand Down
1 change: 1 addition & 0 deletions godot/.github/workflows/web_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ jobs:
platform: web
target: ${{ matrix.target }}
tests: ${{ matrix.tests }}
scons-cache-limit: 0.5

- name: Save Godot build cache
uses: ./.github/actions/godot-cache-save
Expand Down
5 changes: 5 additions & 0 deletions godot/.github/workflows/windows_builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
sconsflags: debug_symbols=no vsproj=yes vsproj_gen_only=no windows_subsystem=console
bin: ./bin/godot.windows.editor.x86_64.exe
compiler: msvc
cache-limit: 2

- name: Editor w/ clang-cl (target=editor, tests=yes, use_llvm=yes)
cache-name: windows-editor-clang
Expand All @@ -39,6 +40,7 @@ jobs:
sconsflags: debug_symbols=no windows_subsystem=console use_llvm=yes
bin: ./bin/godot.windows.editor.x86_64.llvm.exe
compiler: clang
cache-limit: 1

- name: Template (target=template_release, tests=yes)
cache-name: windows-template
Expand All @@ -47,6 +49,7 @@ jobs:
sconsflags: debug_symbols=no
bin: ./bin/godot.windows.template_release.x86_64.console.exe
compiler: msvc
cache-limit: 2

- name: Template w/ GCC (target=template_release, tests=yes, use_mingw=yes)
cache-name: windows-template-gcc
Expand All @@ -56,6 +59,7 @@ jobs:
sconsflags: debug_symbols=no use_mingw=yes
bin: ./bin/godot.windows.template_release.x86_64.console.exe
compiler: gcc
cache-limit: 1

steps:
- name: Checkout
Expand Down Expand Up @@ -93,6 +97,7 @@ jobs:
platform: windows
target: ${{ matrix.target }}
tests: ${{ matrix.tests }}
scons-cache-limit: ${{ matrix.cache-limit }}

- name: Save Godot build cache
uses: ./.github/actions/godot-cache-save
Expand Down
6 changes: 3 additions & 3 deletions godot/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
;
[subrepo]
remote = https://github.com/V-Sekai/godot.git
branch = groups-4.4.2024-12-11T180207Z
commit = ac2c40a1ee1a70a8332917411823036bc0268fd3
parent = 44247d38279b9208059f07a8eb3c7c3c2e4245c9
branch = groups-4.4.2024-12-12T205540Z
commit = a23968f3368ae54cae9d9255c246f3d5b6617252
parent = 14ba2e972ed900d7d010199661900bba5aee777a
method = merge
cmdver = 0.4.9
1 change: 1 addition & 0 deletions godot/core/config/project_settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1563,6 +1563,7 @@ ProjectSettings::ProjectSettings() {
GLOBAL_DEF(PropertyInfo(Variant::INT, "rendering/rendering_device/staging_buffer/block_size_kb", PROPERTY_HINT_RANGE, "4,2048,1,or_greater"), 256);
GLOBAL_DEF(PropertyInfo(Variant::INT, "rendering/rendering_device/staging_buffer/max_size_mb", PROPERTY_HINT_RANGE, "1,1024,1,or_greater"), 128);
GLOBAL_DEF(PropertyInfo(Variant::INT, "rendering/rendering_device/staging_buffer/texture_upload_region_size_px", PROPERTY_HINT_RANGE, "1,256,1,or_greater"), 64);
GLOBAL_DEF(PropertyInfo(Variant::INT, "rendering/rendering_device/staging_buffer/texture_download_region_size_px", PROPERTY_HINT_RANGE, "1,256,1,or_greater"), 64);
GLOBAL_DEF_RST(PropertyInfo(Variant::BOOL, "rendering/rendering_device/pipeline_cache/enable"), true);
GLOBAL_DEF(PropertyInfo(Variant::FLOAT, "rendering/rendering_device/pipeline_cache/save_chunk_size_mb", PROPERTY_HINT_RANGE, "0.000001,64.0,0.001,or_greater"), 3.0);
GLOBAL_DEF(PropertyInfo(Variant::INT, "rendering/rendering_device/vulkan/max_descriptors_per_pool", PROPERTY_HINT_RANGE, "1,256,1,or_greater"), 64);
Expand Down
Loading

0 comments on commit 34a375e

Please sign in to comment.