Skip to content

Commit abaa76f

Browse files
committed
CI: Sync configuration with master branch
Updates various actions to latest versions: actions/cache@v3 actions/checkout@v3 actions/upload-artifact@v3 actions/setup-dotnet@v2 actions/setup-java@v3 actions/setup-python@v4 mymindstorm/setup-emsdk@v11
1 parent a86da2e commit abaa76f

File tree

15 files changed

+47
-26
lines changed

15 files changed

+47
-26
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ inputs:
2020
default: "${{ github.workspace }}/.scons-cache/"
2121
scons-cache-limit:
2222
description: The scons cache size limit.
23-
default: 4096
23+
# actions/cache has 10 GiB limit, and GitHub runners have a 14 GiB disk.
24+
# Limit to 7 GiB to avoid having the extracted cache fill the disk.
25+
default: 7168
2426
runs:
2527
using: "composite"
2628
steps:

.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@v3
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@v4
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@v3
1616
with:
1717
name: ${{ inputs.name }}
1818
path: ${{ inputs.path }}

.github/workflows/android_builds.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on: [push, pull_request]
33

44
# Global Settings
55
env:
6+
# Only used for the cache key. Increment version to force clean build.
67
GODOT_BASE_BRANCH: 3.x
78
SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no
89

@@ -13,11 +14,10 @@ concurrency:
1314
jobs:
1415
android-template:
1516
runs-on: "ubuntu-20.04"
16-
1717
name: Template (target=release, tools=no)
1818

1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v3
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@v3
3131
with:
32+
distribution: temurin
3233
java-version: 11
3334

3435
- name: Setup Godot build cache

.github/workflows/ios_builds.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on: [push, pull_request]
33

44
# Global Settings
55
env:
6+
# Only used for the cache key. Increment version to force clean build.
67
GODOT_BASE_BRANCH: 3.x
78
SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no
89

@@ -16,7 +17,7 @@ jobs:
1617
name: Template (target=release, tools=no)
1718

1819
steps:
19-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v3
2021

2122
- name: Setup Godot build cache
2223
uses: ./.github/actions/godot-cache
@@ -25,7 +26,7 @@ jobs:
2526
- name: Setup python and scons
2627
uses: ./.github/actions/godot-deps
2728

28-
- name: Compilation (armv7)
29+
- name: Compilation (arm64v8)
2930
uses: ./.github/actions/godot-build
3031
with:
3132
sconsflags: ${{ env.SCONSFLAGS }}

.github/workflows/javascript_builds.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on: [push, pull_request]
33

44
# Global Settings
55
env:
6+
# Only used for the cache key. Increment version to force clean build.
67
GODOT_BASE_BRANCH: 3.x
78
SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no
89
EM_VERSION: 3.1.10
@@ -18,18 +19,18 @@ jobs:
1819
name: Template (target=release, tools=no)
1920

2021
steps:
21-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v3
2223

2324
# Additional cache for Emscripten generated system libraries
2425
- name: Load Emscripten cache
2526
id: javascript-template-emscripten-cache
26-
uses: actions/cache@v2
27+
uses: actions/cache@v3
2728
with:
2829
path: ${{env.EM_CACHE_FOLDER}}
2930
key: ${{env.EM_VERSION}}-${{github.job}}
3031

3132
- name: Set up Emscripten latest
32-
uses: mymindstorm/setup-emsdk@v10
33+
uses: mymindstorm/setup-emsdk@v11
3334
with:
3435
version: ${{env.EM_VERSION}}
3536
actions-cache-folder: ${{env.EM_CACHE_FOLDER}}

.github/workflows/linux_builds.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on: [push, pull_request]
33

44
# Global Settings
55
env:
6+
# Only used for the cache key. Increment version to force clean build.
67
GODOT_BASE_BRANCH: 3.x
78
SCONSFLAGS: verbose=yes warnings=all werror=yes
89

@@ -47,7 +48,7 @@ jobs:
4748
artifact: true
4849

4950
steps:
50-
- uses: actions/checkout@v2
51+
- uses: actions/checkout@v3
5152

5253
- name: Linux dependencies
5354
shell: bash
@@ -130,6 +131,7 @@ jobs:
130131
if: ${{ matrix.artifact }}
131132
run: |
132133
strip bin/godot.*
134+
chmod +x bin/godot.*
133135
134136
- name: Upload artifact
135137
uses: ./.github/actions/upload-artifact

.github/workflows/macos_builds.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on: [push, pull_request]
33

44
# Global Settings
55
env:
6+
# Only used for the cache key. Increment version to force clean build.
67
GODOT_BASE_BRANCH: 3.x
78
SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no
89

@@ -30,7 +31,7 @@ jobs:
3031
tools: false
3132

3233
steps:
33-
- uses: actions/checkout@v2
34+
- uses: actions/checkout@v3
3435

3536
- name: Setup Godot build cache
3637
uses: ./.github/actions/godot-cache
@@ -49,6 +50,11 @@ jobs:
4950
target: ${{ matrix.target }}
5051
tools: ${{ matrix.tools }}
5152

53+
- name: Prepare artifact
54+
run: |
55+
strip bin/godot.*
56+
chmod +x bin/godot.*
57+
5258
- name: Upload artifact
5359
uses: ./.github/actions/upload-artifact
5460
with:

.github/workflows/server_builds.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on: [push, pull_request]
33

44
# Global Settings
55
env:
6+
# Only used for the cache key. Increment version to force clean build.
67
GODOT_BASE_BRANCH: 3.x
78
SCONSFLAGS: verbose=yes warnings=all werror=yes debug_symbols=no module_mono_enabled=yes mono_static=yes mono_glue=no
89

@@ -29,7 +30,7 @@ jobs:
2930
tools: false
3031

3132
steps:
32-
- uses: actions/checkout@v2
33+
- uses: actions/checkout@v3
3334

3435
- name: Linux dependencies
3536
shell: bash

0 commit comments

Comments
 (0)