Skip to content

Commit 7882a94

Browse files
committed
git subrepo pull --force --branch=groups-4.4.2025-03-07T020737Z godot
subrepo: subdir: "godot" merged: "17b9ae323e" upstream: origin: "https://github.com/V-Sekai/godot.git" branch: "groups-4.4.2025-03-07T020737Z" commit: "17b9ae323e" git-subrepo: version: "0.4.9" origin: "https://github.com/ingydotnet/git-subrepo" commit: "30db3b8"
1 parent 5eb3632 commit 7882a94

File tree

160 files changed

+3337
-1225
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+3337
-1225
lines changed

godot/.github/actions/godot-cache-restore/action.yml

+33-15
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,42 @@ inputs:
1111
runs:
1212
using: composite
1313
steps:
14-
- name: Restore SCons cache directory
14+
# Because all branches can refer to the repository's default branch's cache, we want it to
15+
# persist as the de-facto fallback. However, it easily expunges in a matter of hours if
16+
# nothing explicitly calls to it, so we work around that by ensuring it's *always* pinged
17+
# prior to any cache operations.
18+
- name: Ping main cache
1519
uses: actions/cache/restore@v4
20+
id: cache-ping
1621
with:
1722
path: ${{ inputs.scons-cache }}
18-
key: ${{ inputs.cache-name }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}-${{ github.sha }}
23+
key: ${{ github.sha }} # Dummy key; we have to rely on the fallback value.
24+
restore-keys: ${{ inputs.cache-name }}|${{ github.event.repository.default_branch }}
25+
lookup-only: true
1926

20-
# We try to match an existing cache to restore from it. Each potential key is checked against
21-
# all existing caches as a prefix. E.g. 'linux-template-minimal' would match any cache that
22-
# starts with "linux-template-minimal", such as "linux-template-minimal-master-refs/heads/master-6588a4a29af1621086feac0117d5d4d37af957fd".
23-
#
24-
# We check these prefixes in this order:
25-
#
26-
# 1. The exact match, including the base branch, the commit reference, and the SHA hash of the commit.
27-
# 2. A partial match for the same base branch and the same commit reference.
28-
# 3. A partial match for the same base branch and the base branch commit reference.
29-
# 4. A partial match for the same base branch only (not ideal, matches any PR with the same base branch).
27+
# Fallback access isn't logged, so register an explicit cache-hit if found.
28+
- name: Ping main cache (exact)
29+
if: steps.cache-ping.outputs.cache-matched-key
30+
uses: actions/cache/restore@v4
31+
with:
32+
path: ${{ inputs.scons-cache }}
33+
key: ${{ steps.cache-ping.outputs.cache-matched-key }}
34+
lookup-only: true
3035

36+
# We try to match an existing cache to restore from it. Each potential key is checked against
37+
# all existing caches as a prefix. E.g. 'linux-template-minimal' would match any cache that
38+
# starts with "linux-template-minimal", such as
39+
# "linux-template-minimal|master|6588a4a29af1621086feac0117d5d4d37af957fd".
40+
#
41+
# We check these prefixes in this order:
42+
# 1. An exact match for the base branch, reference name, and SHA hash.
43+
# 2. A partial match for the same cache name and reference name.
44+
# 3. A partial match for the same cache name and default branch name.
45+
- name: Restore SCons cache directory
46+
uses: actions/cache/restore@v4
47+
with:
48+
path: ${{ inputs.scons-cache }}
49+
key: ${{ inputs.cache-name }}|${{ github.ref_name }}|${{ github.sha }}
3150
restore-keys: |
32-
${{ inputs.cache-name }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}
33-
${{ inputs.cache-name }}-${{ env.GODOT_BASE_BRANCH }}-refs/heads/${{ env.GODOT_BASE_BRANCH }}
34-
${{ inputs.cache-name }}-${{ env.GODOT_BASE_BRANCH }}
51+
${{ inputs.cache-name }}|${{ github.ref_name }}
52+
${{ inputs.cache-name }}|${{ github.event.repository.default_branch }}

godot/.github/actions/godot-cache-save/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ runs:
1515
uses: actions/cache/save@v4
1616
with:
1717
path: ${{ inputs.scons-cache }}
18-
key: ${{ inputs.cache-name }}-${{ env.GODOT_BASE_BRANCH }}-${{ github.ref }}-${{ github.sha }}
18+
key: ${{ inputs.cache-name }}|${{ github.ref_name }}|${{ github.sha }}

godot/.github/actions/godot-cpp-build/action.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
name: Build godot-cpp
22
description: Build godot-cpp with the provided options.
33

4-
env:
5-
GODOT_CPP_BRANCH: 4.4
6-
74
inputs:
85
bin:
96
description: Path to the Godot binary.
@@ -16,6 +13,10 @@ inputs:
1613
description: The SCons cache path.
1714
default: ${{ github.workspace }}/.scons_cache/
1815
type: string
16+
godot-cpp-branch:
17+
description: The godot-cpp branch.
18+
default: master
19+
type: string
1920

2021
runs:
2122
using: composite
@@ -25,7 +26,7 @@ runs:
2526
with:
2627
submodules: recursive
2728
repository: godotengine/godot-cpp
28-
ref: ${{ env.GODOT_CPP_BRANCH }}
29+
ref: ${{ inputs.godot-cpp-branch }}
2930
path: godot-cpp
3031

3132
- name: Extract API

godot/.github/actions/godot-deps/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ inputs:
1010
default: x64
1111
scons-version:
1212
description: The SCons version to use.
13-
default: 4.8.1
13+
default: 4.9.0
1414

1515
runs:
1616
using: composite

godot/.github/workflows/android_builds.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ on:
44

55
# Global Settings
66
env:
7-
# Used for the cache key. Add version suffix to force clean build.
8-
GODOT_BASE_BRANCH: master
97
SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes strict_checks=yes
108

119
jobs:
@@ -62,8 +60,8 @@ jobs:
6260
- name: Download pre-built Android Swappy Frame Pacing Library
6361
uses: dsaltares/[email protected]
6462
with:
65-
repo: darksylinc/godot-swappy
66-
version: tags/v2023.3.0.0
63+
repo: godotengine/godot-swappy
64+
version: tags/from-source-2025-01-31
6765
file: godot-swappy.7z
6866
target: swappy/godot-swappy.7z
6967

godot/.github/workflows/ios_builds.yml

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ on:
44

55
# Global Settings
66
env:
7-
# Used for the cache key. Add version suffix to force clean build.
8-
GODOT_BASE_BRANCH: master
97
SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no module_text_server_fb_enabled=yes strict_checks=yes
108

119
jobs:

godot/.github/workflows/linux_builds.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ on:
44

55
# Global Settings
66
env:
7-
# Used for the cache key. Add version suffix to force clean build.
8-
GODOT_BASE_BRANCH: master
7+
GODOT_CPP_BRANCH: 4.4
98
SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes strict_checks=yes
109
DOTNET_NOLOGO: true
1110
DOTNET_CLI_TELEMETRY_OPTOUT: true
@@ -174,6 +173,7 @@ jobs:
174173
with:
175174
bin: ${{ matrix.bin }}
176175
scons-flags: target=template_debug dev_build=yes verbose=yes
176+
godot-cpp-branch: ${{ env.GODOT_CPP_BRANCH }}
177177

178178
- name: Save Godot build cache
179179
uses: ./.github/actions/godot-cache-save

godot/.github/workflows/macos_builds.yml

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ on:
44

55
# Global Settings
66
env:
7-
# Used for the cache key. Add version suffix to force clean build.
8-
GODOT_BASE_BRANCH: master
97
SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes strict_checks=yes
108

119
jobs:

godot/.github/workflows/web_builds.yml

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ on:
44

55
# Global Settings
66
env:
7-
# Used for the cache key. Add version suffix to force clean build.
8-
GODOT_BASE_BRANCH: master
97
SCONSFLAGS: verbose=yes warnings=extra werror=yes debug_symbols=no use_closure_compiler=yes strict_checks=yes
108
EM_VERSION: 3.1.64
119

godot/.github/workflows/windows_builds.yml

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ on:
55
# Global Settings
66
# SCONS_CACHE for windows must be set in the build environment
77
env:
8-
# Used for the cache key. Add version suffix to force clean build.
9-
GODOT_BASE_BRANCH: master
108
SCONSFLAGS: verbose=yes warnings=extra werror=yes module_text_server_fb_enabled=yes d3d12=yes strict_checks=yes "angle_libs=${{ github.workspace }}/"
119
SCONS_CACHE_MSVC_CONFIG: true
1210

godot/.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,11 @@ bld/
263263
!thirdparty/**/arm/
264264
!thirdparty/**/arm64/
265265

266+
thirdparty/swappy-frame-pacing/arm64-v8a/abi.json
267+
thirdparty/swappy-frame-pacing/armeabi-v7a/abi.json
268+
thirdparty/swappy-frame-pacing/x86/abi.json
269+
thirdparty/swappy-frame-pacing/x86_64/abi.json
270+
266271
# Visual Studio 2015/2017 cache/options directory
267272
.vs/
268273

godot/.gitrepo

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
;
66
[subrepo]
77
remote = https://github.com/V-Sekai/godot.git
8-
branch = groups-4.4.2025-03-03T191723Z
9-
commit = 280f36c80d7e808fecd1e96348950701de99a01f
10-
parent = 7e62cd864aef513a92d333cc1780fc8f412de0e9
8+
branch = groups-4.4.2025-03-07T020737Z
9+
commit = 17b9ae323e84d924b6328a487c51a06a14fcad6e
10+
parent = 5eb36323fd1188807490fda2a3929cf21b2121ba
1111
method = merge
1212
cmdver = 0.4.9

godot/SConstruct

+8-8
Original file line numberDiff line numberDiff line change
@@ -1085,11 +1085,11 @@ if "check_c_headers" in env:
10851085
for header in headers:
10861086
if conf.CheckCHeader(header):
10871087
env.AppendUnique(CPPDEFINES=[headers[header]])
1088-
1089-
1090-
methods.show_progress(env)
1091-
# TODO: replace this with `env.Dump(format="json")`
1092-
# once we start requiring SCons 4.0 as min version.
1093-
methods.dump(env)
1094-
methods.prepare_purge(env)
1095-
methods.prepare_timer()
1088+
conf.Finish()
1089+
1090+
# Miscellaneous & post-build methods.
1091+
if not env.GetOption("clean") and not env.GetOption("help"):
1092+
methods.dump(env)
1093+
methods.show_progress(env)
1094+
methods.prepare_purge(env)
1095+
methods.prepare_timer()

godot/core/core_bind.compat.inc

+2
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ Dictionary OS::_execute_with_pipe_bind_compat_94434(const String &p_path, const
5353
}
5454

5555
void OS::_bind_compatibility_methods() {
56+
ClassDB::bind_compatibility_method(D_METHOD("read_string_from_stdin", "buffer_size"), &OS::read_string_from_stdin);
57+
ClassDB::bind_compatibility_method(D_METHOD("read_buffer_from_stdin", "buffer_size"), &OS::read_buffer_from_stdin);
5658
ClassDB::bind_compatibility_method(D_METHOD("read_string_from_stdin"), &OS::_read_string_from_stdin_bind_compat_91201);
5759
ClassDB::bind_compatibility_method(D_METHOD("execute_with_pipe", "path", "arguments"), &OS::_execute_with_pipe_bind_compat_94434);
5860
}

godot/core/core_bind.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -671,8 +671,8 @@ void OS::_bind_methods() {
671671
ClassDB::bind_method(D_METHOD("get_system_font_path_for_text", "font_name", "text", "locale", "script", "weight", "stretch", "italic"), &OS::get_system_font_path_for_text, DEFVAL(String()), DEFVAL(String()), DEFVAL(400), DEFVAL(100), DEFVAL(false));
672672
ClassDB::bind_method(D_METHOD("get_executable_path"), &OS::get_executable_path);
673673

674-
ClassDB::bind_method(D_METHOD("read_string_from_stdin", "buffer_size"), &OS::read_string_from_stdin);
675-
ClassDB::bind_method(D_METHOD("read_buffer_from_stdin", "buffer_size"), &OS::read_buffer_from_stdin);
674+
ClassDB::bind_method(D_METHOD("read_string_from_stdin", "buffer_size"), &OS::read_string_from_stdin, DEFVAL(1024));
675+
ClassDB::bind_method(D_METHOD("read_buffer_from_stdin", "buffer_size"), &OS::read_buffer_from_stdin, DEFVAL(1024));
676676
ClassDB::bind_method(D_METHOD("get_stdin_type"), &OS::get_stdin_type);
677677
ClassDB::bind_method(D_METHOD("get_stdout_type"), &OS::get_stdout_type);
678678
ClassDB::bind_method(D_METHOD("get_stderr_type"), &OS::get_stderr_type);

0 commit comments

Comments
 (0)