Skip to content

Commit a572a99

Browse files
committed
Merge tag '4.6.2-stable' into work2
2 parents cb649fa + 001aa12 commit a572a99

193 files changed

Lines changed: 3503 additions & 1273 deletions

File tree

Some content is hidden

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

.github/CODEOWNERS

Lines changed: 82 additions & 50 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ runs:
1212
using: composite
1313
steps:
1414
- name: Restore default cache
15-
uses: actions/cache/restore@v4
15+
uses: actions/cache/restore@v5
1616
id: cache-ping
1717
with:
1818
path: ${{ inputs.scons-cache }}
@@ -27,7 +27,7 @@ runs:
2727
# This is done after pulling the default cache so that PRs can integrate any potential changes
2828
# from the default branch without conflicting with whatever local changes were already made.
2929
- name: Restore local cache
30-
uses: actions/cache/restore@v4
30+
uses: actions/cache/restore@v5
3131
if: github.ref_name != github.event.repository.default_branch
3232
with:
3333
path: ${{ inputs.scons-cache }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ runs:
1616
run: misc/scripts/purge_cache.py ${{ env.CACHE_TIMESTAMP }} "${{ inputs.scons-cache }}"
1717

1818
- name: Save SCons cache directory
19-
uses: actions/cache/save@v4
19+
uses: actions/cache/save@v5
2020
with:
2121
path: ${{ inputs.scons-cache }}
2222
key: ${{ inputs.cache-name }}|${{ github.ref_name }}|${{ github.sha }}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,6 @@ runs:
3535

3636
- name: SCons Build
3737
shell: sh
38+
env:
39+
SCONS_CACHE: ${{ inputs.scons-cache }}
3840
run: scons --directory=./godot-cpp/test "gdextension_dir=${{ github.workspace }}" ${{ inputs.scons-flags }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ runs:
1616
using: composite
1717
steps:
1818
- name: Set up Python 3.x
19-
uses: actions/setup-python@v5
19+
uses: actions/setup-python@v6
2020
with:
2121
# Semantic version range syntax or exact version of a Python version.
2222
python-version: ${{ inputs.python-version }}

.github/actions/upload-artifact/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ runs:
1414
using: composite
1515
steps:
1616
- name: Upload Godot Artifact
17-
uses: actions/upload-artifact@v4
17+
uses: actions/upload-artifact@v7
1818
with:
1919
name: ${{ inputs.name }}
2020
path: ${{ inputs.path }}

.github/workflows/linux_builds.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88
SCONS_FLAGS: >-
99
dev_mode=yes
1010
module_text_server_fb_enabled=yes
11-
"accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.18.0/"
11+
"accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.21.2/"
1212
GODOT_CPP_BRANCH: 4.5
1313
DOTNET_NOLOGO: true
1414
DOTNET_CLI_TELEMETRY_OPTOUT: true
@@ -161,13 +161,13 @@ jobs:
161161
- name: Download pre-built AccessKit
162162
uses: dsaltares/fetch-gh-release-asset@1.1.2
163163
with:
164-
repo: AccessKit/accesskit-c
165-
version: tags/0.18.0
166-
file: accesskit-c-0.18.0.zip
167-
target: accesskit-c-0.18.0/accesskit_c.zip
164+
repo: godotengine/godot-accesskit-c-static
165+
version: tags/0.21.2
166+
file: accesskit-c-0.21.2.zip
167+
target: accesskit-c-0.21.2/accesskit_c.zip
168168

169169
- name: Extract pre-built AccessKit
170-
run: unzip -o accesskit-c-0.18.0/accesskit_c.zip
170+
run: unzip -o accesskit-c-0.21.2/accesskit_c.zip
171171

172172
- name: Install mold linker
173173
if: matrix.proj-test

.github/workflows/macos_builds.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88
SCONS_FLAGS: >-
99
dev_mode=yes
1010
module_text_server_fb_enabled=yes
11-
"accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.18.0/"
11+
"accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.21.2/"
1212
1313
jobs:
1414
build-macos:
@@ -53,13 +53,13 @@ jobs:
5353
- name: Download pre-built AccessKit
5454
uses: dsaltares/fetch-gh-release-asset@1.1.2
5555
with:
56-
repo: AccessKit/accesskit-c
57-
version: tags/0.18.0
58-
file: accesskit-c-0.18.0.zip
59-
target: accesskit-c-0.18.0/accesskit_c.zip
56+
repo: godotengine/godot-accesskit-c-static
57+
version: tags/0.21.2
58+
file: accesskit-c-0.21.2.zip
59+
target: accesskit-c-0.21.2/accesskit_c.zip
6060

6161
- name: Extract pre-built AccessKit
62-
run: unzip -o accesskit-c-0.18.0/accesskit_c.zip
62+
run: unzip -o accesskit-c-0.21.2/accesskit_c.zip
6363

6464
- name: Setup Vulkan SDK
6565
id: vulkan-sdk

.github/workflows/windows_builds.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
module_text_server_fb_enabled=yes
1111
debug_symbols=no
1212
"angle_libs=${{ github.workspace }}/"
13-
"accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.18.0/"
13+
"accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.21.2/"
1414
SCONS_CACHE_MSVC_CONFIG: true
1515
PYTHONIOENCODING: utf8
1616

@@ -98,13 +98,13 @@ jobs:
9898
- name: Download pre-built AccessKit
9999
uses: dsaltares/fetch-gh-release-asset@1.1.2
100100
with:
101-
repo: AccessKit/accesskit-c
102-
version: tags/0.18.0
103-
file: accesskit-c-0.18.0.zip
104-
target: accesskit-c-0.18.0/accesskit_c.zip
101+
repo: godotengine/godot-accesskit-c-static
102+
version: tags/0.21.2
103+
file: accesskit-c-0.21.2.zip
104+
target: accesskit-c-0.21.2/accesskit_c.zip
105105

106106
- name: Extract pre-built AccessKit
107-
run: unzip -o accesskit-c-0.18.0/accesskit_c.zip
107+
run: unzip -o accesskit-c-0.21.2/accesskit_c.zip
108108

109109
- name: Compilation
110110
uses: ./.github/actions/godot-build

0 commit comments

Comments
 (0)