Skip to content

Commit b4ce32b

Browse files
committed
Merge pull request godotengine#98898 from Repiteo/ci/ubuntu-version-bump
CI: Update Linux runners to Ubuntu 24.04
2 parents 87318a2 + 02d57e9 commit b4ce32b

File tree

6 files changed

+21
-5
lines changed

6 files changed

+21
-5
lines changed

.github/workflows/android_builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414

1515
jobs:
1616
build-android:
17-
runs-on: ubuntu-20.04
17+
runs-on: ubuntu-24.04
1818
name: ${{ matrix.name }}
1919
strategy:
2020
fail-fast: false

.github/workflows/godot_cpp_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ concurrency:
1515

1616
jobs:
1717
godot-cpp-tests:
18-
runs-on: ubuntu-20.04
18+
runs-on: ubuntu-24.04
1919
name: Build and test Godot CPP
2020
steps:
2121
- name: Checkout

.github/workflows/linux_builds.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ concurrency:
1717

1818
jobs:
1919
build-linux:
20-
runs-on: ubuntu-20.04
20+
# If unspecified, stay one LTS before latest to increase portability of Linux artifacts.
21+
runs-on: ${{ matrix.os || 'ubuntu-22.04' }}
2122
name: ${{ matrix.name }}
2223
strategy:
2324
fail-fast: false
@@ -60,6 +61,7 @@ jobs:
6061
artifact: false
6162
# Test our oldest supported SCons/Python versions on one arbitrary editor build.
6263
legacy-scons: true
64+
os: ubuntu-20.04
6365

6466
- name: Editor with ThreadSanitizer (target=editor, tests=yes, dev_build=yes, use_tsan=yes, use_llvm=yes, linker=lld)
6567
cache-name: linux-editor-thread-sanitizer

.github/workflows/static_checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ concurrency:
99
jobs:
1010
static-checks:
1111
name: Code style, file formatting, and docs
12-
runs-on: ubuntu-22.04
12+
runs-on: ubuntu-24.04
1313
steps:
1414
- name: Checkout
1515
uses: actions/checkout@v4

.github/workflows/web_builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ concurrency:
1616

1717
jobs:
1818
web-template:
19-
runs-on: ubuntu-22.04
19+
runs-on: ubuntu-24.04
2020
name: ${{ matrix.name }}
2121
strategy:
2222
fail-fast: false

core/templates/ring_buffer.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,16 @@ class RingBuffer {
6464
end = MIN(end, size());
6565
int total = end - pos;
6666
const T *read = data.ptr();
67+
#if defined(__GNUC__) && !defined(__clang__)
68+
#pragma GCC diagnostic push
69+
#pragma GCC diagnostic ignored "-Wstringop-overflow="
70+
#endif
6771
for (int i = 0; i < total; i++) {
6872
p_buf[dst++] = read[pos + i];
6973
}
74+
#if defined(__GNUC__) && !defined(__clang__)
75+
#pragma GCC diagnostic pop
76+
#endif
7077
to_read -= total;
7178
pos = 0;
7279
}
@@ -93,9 +100,16 @@ class RingBuffer {
93100
int end = pos + to_read;
94101
end = MIN(end, size());
95102
int total = end - pos;
103+
#if defined(__GNUC__) && !defined(__clang__)
104+
#pragma GCC diagnostic push
105+
#pragma GCC diagnostic ignored "-Wstringop-overflow="
106+
#endif
96107
for (int i = 0; i < total; i++) {
97108
p_buf[dst++] = data[pos + i];
98109
}
110+
#if defined(__GNUC__) && !defined(__clang__)
111+
#pragma GCC diagnostic pop
112+
#endif
99113
to_read -= total;
100114
pos = 0;
101115
}

0 commit comments

Comments
 (0)