Skip to content

Commit 01621dd

Browse files
authored
Merge pull request #98864 from akien-mga/3.4-ci-build-warning-fixes
[3.4] Misc. build and warning fixes to pass CI and compile with recent SCons and GCC/Clang
2 parents f9ac000 + d5345b7 commit 01621dd

Some content is hidden

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

50 files changed

+886
-400
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ runs:
1212
steps:
1313
# Upload cache on completion and check it out now
1414
- name: Load .scons_cache directory
15-
uses: actions/cache@v2
15+
uses: actions/cache@v4
1616
with:
1717
path: ${{inputs.scons-cache}}
1818
key: ${{inputs.cache-name}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ runs:
1212
steps:
1313
# Use python 3.x release (works cross platform)
1414
- name: Set up Python 3.x
15-
uses: actions/setup-python@v2
15+
uses: actions/setup-python@v5
1616
with:
1717
# Semantic version range syntax or exact version of a Python version
1818
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
@@ -12,7 +12,7 @@ runs:
1212
using: "composite"
1313
steps:
1414
- name: Upload Godot Artifact
15-
uses: actions/upload-artifact@v2
15+
uses: actions/upload-artifact@v4
1616
with:
1717
name: ${{ inputs.name }}
1818
path: ${{ inputs.path }}

.github/workflows/android_builds.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
name: Template (target=release, tools=no)
1818

1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v4
2121

2222
# Azure repositories are not reliable, we need to prevent azure giving us packages.
2323
- name: Make apt sources.list use the default Ubuntu repositories
@@ -27,8 +27,9 @@ jobs:
2727
sudo apt-get update
2828
2929
- name: Set up Java 11
30-
uses: actions/setup-java@v1
30+
uses: actions/setup-java@v4
3131
with:
32+
distribution: temurin
3233
java-version: 11
3334

3435
- name: Setup Godot build cache

.github/workflows/ios_builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
name: Template (target=release, tools=no)
1717

1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v4
2020

2121
- name: Setup Godot build cache
2222
uses: ./.github/actions/godot-cache

.github/workflows/javascript_builds.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ jobs:
1818
name: Template (target=release, tools=no)
1919

2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v4
2222

2323
# Additional cache for Emscripten generated system libraries
2424
- name: Load Emscripten cache
2525
id: javascript-template-emscripten-cache
26-
uses: actions/cache@v2
26+
uses: actions/cache@v4
2727
with:
2828
path: ${{env.EM_CACHE_FOLDER}}
2929
key: ${{env.EM_VERSION}}-${{github.job}}
3030

3131
- name: Set up Emscripten latest
32-
uses: mymindstorm/setup-emsdk@v10
32+
uses: mymindstorm/setup-emsdk@v14
3333
with:
3434
version: ${{env.EM_VERSION}}
3535
actions-cache-folder: ${{env.EM_CACHE_FOLDER}}

.github/workflows/linux_builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
artifact: true
4848

4949
steps:
50-
- uses: actions/checkout@v2
50+
- uses: actions/checkout@v4
5151

5252
- name: Linux dependencies
5353
shell: bash

.github/workflows/macos_builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
tools: false
3131

3232
steps:
33-
- uses: actions/checkout@v2
33+
- uses: actions/checkout@v4
3434

3535
- name: Setup Godot build cache
3636
uses: ./.github/actions/godot-cache

.github/workflows/server_builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
tools: false
3030

3131
steps:
32-
- uses: actions/checkout@v2
32+
- uses: actions/checkout@v4
3333

3434
- name: Linux dependencies
3535
shell: bash

.github/workflows/static_checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-20.04
88
steps:
99
- name: Checkout
10-
uses: actions/checkout@v2
10+
uses: actions/checkout@v4
1111

1212
# Azure repositories are not reliable, we need to prevent Azure giving us packages.
1313
- name: Make apt sources.list use the default Ubuntu repositories

0 commit comments

Comments
 (0)