Skip to content

Commit 18cbde9

Browse files
authored
Merge pull request #22 from Spartan322/4.3-update/ci
[4.3] Update CI to ubuntu-22.04
2 parents 1d68331 + 93d505d commit 18cbde9

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ env:
77
GODOT_BASE_BRANCH: master
88
# Used to select the version of Redot to run the tests with.
99
REDOT_TEST_VERSION: 4.3.1-alpha.1
10+
# Use UTF-8 on Linux.
11+
LANG: en_US.UTF-8
12+
LC_ALL: en_US.UTF-8
1013

1114
concurrency:
1215
group: ci-${{ github.actor }}-${{ github.head_ref || github.run_number }}-${{ github.ref }}
@@ -21,15 +24,15 @@ jobs:
2124
matrix:
2225
include:
2326
- name: 🐧 Linux (GCC)
24-
os: ubuntu-20.04
27+
os: ubuntu-22.04
2528
platform: linux
2629
artifact-name: redot-cpp-linux-glibc2.27-x86_64-release
2730
artifact-path: bin/libredot-cpp.linux.template_release.x86_64.a
2831
run-tests: true
2932
cache-name: linux-x86_64
3033

3134
- name: 🐧 Linux (GCC, Double Precision)
32-
os: ubuntu-20.04
35+
os: ubuntu-22.04
3336
platform: linux
3437
artifact-name: redot-cpp-linux-glibc2.27-x86_64-double-release
3538
artifact-path: bin/libredot-cpp.linux.template_release.double.x86_64.a
@@ -64,7 +67,7 @@ jobs:
6467
cache-name: macos-universal
6568

6669
- name: 🤖 Android (arm64)
67-
os: ubuntu-20.04
70+
os: ubuntu-22.04
6871
platform: android
6972
artifact-name: redot-cpp-android-arm64-release
7073
artifact-path: bin/libredot-cpp.android.template_release.arm64.a
@@ -82,7 +85,7 @@ jobs:
8285
cache-name: ios-arm64
8386

8487
- name: 🌐 Web (wasm32)
85-
os: ubuntu-20.04
88+
os: ubuntu-22.04
8689
platform: web
8790
artifact-name: redot-cpp-web-wasm32-release
8891
artifact-path: bin/libredot-cpp.web.template_release.wasm32.a
@@ -183,7 +186,7 @@ jobs:
183186

184187
linux-cmake:
185188
name: 🐧 Build (Linux, GCC, CMake)
186-
runs-on: ubuntu-20.04
189+
runs-on: ubuntu-22.04
187190
steps:
188191
- name: Checkout
189192
uses: actions/checkout@v4
@@ -207,7 +210,7 @@ jobs:
207210
208211
linux-cmake-ninja:
209212
name: 🐧 Build (Linux, GCC, CMake Ninja)
210-
runs-on: ubuntu-20.04
213+
runs-on: ubuntu-22.04
211214
steps:
212215
- name: Checkout
213216
uses: actions/checkout@v4

include/godot_cpp/classes/wrapped.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ public:
262262
} \
263263
\
264264
static const ::godot::StringName &get_class_static() { \
265-
static const ::godot::StringName string_name = ::godot::StringName(#m_class); \
265+
static const ::godot::StringName string_name = ::godot::StringName(U## #m_class); \
266266
return string_name; \
267267
} \
268268
\

test/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
3838
# using Visual Studio C++
3939
set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} /WX") # /GF /MP
4040
set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} /DTYPED_METHOD_BIND")
41+
set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} /utf-8")
4142

4243
if(CMAKE_BUILD_TYPE MATCHES Debug)
4344
set(GODOT_COMPILE_FLAGS "${GODOT_COMPILE_FLAGS} /MDd") # /Od /RTC1 /Zi

0 commit comments

Comments
 (0)