Skip to content

Commit b8b5a13

Browse files
CedNaruCedNaru
authored
Bump to 4.2.2 (#612)
1 parent 50e7675 commit b8b5a13

File tree

99 files changed

+1422
-1256
lines changed

Some content is hidden

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

99 files changed

+1422
-1256
lines changed

‎.github/workflows/check-pr-engine-editor-debug-and-tests.yaml‎

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ on: [pull_request]
33

44
env:
55
SCONS_CACHE_MSVC_CONFIG: true
6-
GODOT_BASE_VERSION: 4.2.0
7-
GODOT_BASE_BRANCH: 4.2.0
6+
GODOT_BASE_VERSION: 4.2.2
7+
GODOT_BASE_BRANCH: 4.2.2
88

99
concurrency:
1010
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-check-pr-engine-editor-debug-and-tests
@@ -30,14 +30,7 @@ jobs:
3030
uses: actions/checkout@v2
3131
with:
3232
repository: godotengine/godot
33-
ref: 4.2.1-stable
34-
# TODO: remove once on godot 4.2.2 or newer!
35-
- name: Cherry pick macos fix
36-
run: |
37-
git fetch -a
38-
git config --global user.email "mario@super.com"
39-
git config --global user.name "Super Mario"
40-
git cherry-pick a2c1c01941a3dec3e2a361d9dc21bb0390efcbaf
33+
ref: 4.2.2-stable
4134
- name: Clone Godot JVM module.
4235
uses: actions/checkout@v2
4336
with:
@@ -85,14 +78,7 @@ jobs:
8578
uses: actions/checkout@v2
8679
with:
8780
repository: godotengine/godot
88-
ref: 4.2.1-stable
89-
# TODO: remove once on godot 4.2.2 or newer!
90-
- name: Cherry pick macos fix
91-
run: |
92-
git fetch -a
93-
git config --global user.email "mario@super.com"
94-
git config --global user.name "Super Mario"
95-
git cherry-pick a2c1c01941a3dec3e2a361d9dc21bb0390efcbaf
81+
ref: 4.2.2-stable
9682
- name: Clone Godot JVM module.
9783
uses: actions/checkout@v2
9884
with:
@@ -174,14 +160,7 @@ jobs:
174160
uses: actions/checkout@v2
175161
with:
176162
repository: godotengine/godot
177-
ref: 4.2.1-stable
178-
# TODO: remove once on godot 4.2.2 or newer!
179-
- name: Cherry pick macos fix
180-
run: |
181-
git fetch -a
182-
git config --global user.email "mario@super.com"
183-
git config --global user.name "Super Mario"
184-
git cherry-pick a2c1c01941a3dec3e2a361d9dc21bb0390efcbaf
163+
ref: 4.2.2-stable
185164
- name: Clone Godot JVM module.
186165
uses: actions/checkout@v2
187166
with:

‎.github/workflows/check-pr-engine-editor-release.yaml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ on: [pull_request]
33

44
env:
55
SCONS_CACHE_MSVC_CONFIG: true
6-
GODOT_BASE_VERSION: 4.2.0
7-
GODOT_BASE_BRANCH: 4.2.0
6+
GODOT_BASE_VERSION: 4.2.2
7+
GODOT_BASE_BRANCH: 4.2.2
88

99
concurrency:
1010
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-check-pr-engine-editor-release
@@ -39,19 +39,12 @@ jobs:
3939
uses: actions/checkout@v2
4040
with:
4141
repository: godotengine/godot
42-
ref: 4.2.1-stable
42+
ref: 4.2.2-stable
4343
- name: Clone Godot JVM module.
4444
uses: actions/checkout@v2
4545
with:
4646
path: modules/kotlin_jvm
4747
submodules: recursive
48-
# TODO: remove once on godot 4.2.2 or newer!
49-
- name: Cherry pick macos fix
50-
run: |
51-
git fetch -a
52-
git config --global user.email "mario@super.com"
53-
git config --global user.name "Super Mario"
54-
git cherry-pick a2c1c01941a3dec3e2a361d9dc21bb0390efcbaf
5548
- name: Setup Godot dependencies
5649
uses: ./.github/actions/godot-deps
5750
- name: Fix scons version

‎.github/workflows/check-pr-engine-export-template-debug.yaml‎

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

44
env:
55
SCONS_CACHE_MSVC_CONFIG: true
6-
GODOT_BASE_VERSION: 4.2.1
7-
GODOT_BASE_BRANCH: 4.2.1
6+
GODOT_BASE_VERSION: 4.2.2
7+
GODOT_BASE_BRANCH: 4.2.2
88

99
concurrency:
1010
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-check-pr-engine-export-template-debug
@@ -63,14 +63,7 @@ jobs:
6363
uses: actions/checkout@v2
6464
with:
6565
repository: godotengine/godot
66-
ref: 4.2.1-stable
67-
# TODO: remove once on godot 4.2.2 or newer!
68-
- name: Cherry pick macos fix
69-
run: |
70-
git fetch -a
71-
git config --global user.email "mario@super.com"
72-
git config --global user.name "Super Mario"
73-
git cherry-pick a2c1c01941a3dec3e2a361d9dc21bb0390efcbaf
66+
ref: 4.2.2-stable
7467
- name: Clone Godot JVM module.
7568
uses: actions/checkout@v2
7669
with:
@@ -129,7 +122,7 @@ jobs:
129122
uses: actions/checkout@v2
130123
with:
131124
repository: godotengine/godot
132-
ref: 4.2.1-stable
125+
ref: 4.2.2-stable
133126
- name: Clone Godot JVM module.
134127
uses: actions/checkout@v2
135128
with:

‎.github/workflows/check-pr-engine-export-template-release.yaml‎

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

44
env:
55
SCONS_CACHE_MSVC_CONFIG: true
6-
GODOT_BASE_VERSION: 4.2.0
6+
GODOT_BASE_VERSION: 4.2.2
77

88
concurrency:
99
group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-check-pr-engine-export-template-release
@@ -62,19 +62,12 @@ jobs:
6262
uses: actions/checkout@v2
6363
with:
6464
repository: godotengine/godot
65-
ref: 4.2.1-stable
65+
ref: 4.2.2-stable
6666
- name: Clone Godot JVM module.
6767
uses: actions/checkout@v2
6868
with:
6969
path: modules/kotlin_jvm
7070
submodules: recursive
71-
# TODO: remove once on godot 4.2.2 or newer!
72-
- name: Cherry pick macos fix
73-
run: |
74-
git fetch -a
75-
git config --global user.email "mario@super.com"
76-
git config --global user.name "Super Mario"
77-
git cherry-pick a2c1c01941a3dec3e2a361d9dc21bb0390efcbaf
7871
- name: Setup Godot dependencies
7972
uses: ./.github/actions/godot-deps
8073
- name: Fix scons version
@@ -128,7 +121,7 @@ jobs:
128121
uses: actions/checkout@v2
129122
with:
130123
repository: godotengine/godot
131-
ref: 4.2.1-stable
124+
ref: 4.2.2-stable
132125
- name: Clone Godot JVM module.
133126
uses: actions/checkout@v2
134127
with:

‎.github/workflows/check-pr-entry-generator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/checkout@v2
1414
with:
1515
repository: godotengine/godot
16-
ref: 4.2.1-stable
16+
ref: 4.2.2-stable
1717
- name: Clone Godot JVM module.
1818
uses: actions/checkout@v2
1919
with:

‎.github/workflows/check-pr-godot-kotlin-symbol-processor.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/checkout@v2
1414
with:
1515
repository: godotengine/godot
16-
ref: 4.2.1-stable
16+
ref: 4.2.2-stable
1717
- name: Clone Godot JVM module.
1818
uses: actions/checkout@v2
1919
with:

‎.github/workflows/check-pr-jvm-godot-library.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/checkout@v2
2222
with:
2323
repository: godotengine/godot
24-
ref: 4.2.1-stable
24+
ref: 4.2.2-stable
2525
- name: Clone Godot JVM module.
2626
uses: actions/checkout@v2
2727
with:

‎.github/workflows/deploy-export-template.yaml‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -165,15 +165,8 @@ jobs:
165165
uses: actions/checkout@v2
166166
with:
167167
repository: godotengine/godot
168-
ref: 4.2.1-stable
168+
ref: 4.2.2-stable
169169

170-
# TODO: remove once on godot 4.2.2 or newer!
171-
- name: Cherry pick macos fix
172-
run: |
173-
git fetch -a
174-
git config --global user.email "mario@super.com"
175-
git config --global user.name "Super Mario"
176-
git cherry-pick a2c1c01941a3dec3e2a361d9dc21bb0390efcbaf
177170

178171
- name: Clone Godot JVM module.
179172
uses: actions/checkout@v2
@@ -266,7 +259,7 @@ jobs:
266259
uses: actions/checkout@v2
267260
with:
268261
repository: godotengine/godot
269-
ref: 4.2.1-stable
262+
ref: 4.2.2-stable
270263

271264
- name: Clone Godot JVM module.
272265
uses: actions/checkout@v2
@@ -418,7 +411,7 @@ jobs:
418411
uses: actions/checkout@v2
419412
with:
420413
repository: godotengine/godot
421-
ref: 4.2.1-stable
414+
ref: 4.2.2-stable
422415

423416
- name: Get release export template binary
424417
uses: actions/download-artifact@v3
@@ -477,7 +470,7 @@ jobs:
477470
uses: actions/checkout@v2
478471
with:
479472
repository: godotengine/godot
480-
ref: 4.2.1-stable
473+
ref: 4.2.2-stable
481474

482475
- name: Get release export template binary
483476
uses: actions/download-artifact@v3
@@ -619,7 +612,7 @@ jobs:
619612

620613
- name: Create version.txt
621614
run: |
622-
refVersion=4.2.1-stable #for easier search and replace with other `ref` occurrences
615+
refVersion=4.2.2-stable #for easier search and replace with other `ref` occurrences
623616
templatesVersion=${refVersion//-/.} #replace `-` with `.` in templates version
624617
echo "$templatesVersion" > templates/version.txt
625618
shell: bash

‎.github/workflows/deploy-godot-editor-release.yaml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,8 @@ jobs:
7474
uses: actions/checkout@v2
7575
with:
7676
repository: godotengine/godot
77-
ref: 4.2.1-stable
77+
ref: 4.2.2-stable
7878

79-
# TODO: remove once on godot 4.2.2 or newer!
80-
- name: Cherry pick macos fix
81-
run: |
82-
git fetch -a
83-
git config --global user.email "mario@super.com"
84-
git config --global user.name "Super Mario"
85-
git cherry-pick a2c1c01941a3dec3e2a361d9dc21bb0390efcbaf
8679

8780
- name: Setup Vulkan SDK
8881
if: matrix.platform == 'macos'
@@ -237,7 +230,7 @@ jobs:
237230
uses: actions/checkout@v2
238231
with:
239232
repository: godotengine/godot
240-
ref: 4.2.1-stable
233+
ref: 4.2.2-stable
241234

242235
- name: Get editor binary
243236
uses: actions/download-artifact@v3

‎.github/workflows/deploy-godot-entry-generator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
uses: actions/checkout@v2
1515
with:
1616
repository: godotengine/godot
17-
ref: 4.2.1-stable
17+
ref: 4.2.2-stable
1818
- name: Clone Godot JVM module.
1919
uses: actions/checkout@v2
2020
with:

0 commit comments

Comments
 (0)