Skip to content

Commit ccddb55

Browse files
pheiduckchrisbra
authored andcommitted
patch 9.1.1729: CI is not run with clang 21
Problem: CI is not run with clang 21 Solution: Update CI to v21, fix a few warnings that are uncovered when using clang 21 (Philip H) closes: #18142 Signed-off-by: Philip H. <47042125+pheiduck@users.noreply.github.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
1 parent 884290e commit ccddb55

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
env:
2323
CC: ${{ matrix.compiler }}
2424
GCC_VER: 14
25-
CLANG_VER: 20
25+
CLANG_VER: 21
2626
TEST: test
2727
SRCDIR: ./src
2828
LEAK_CFLAGS: -DEXITFREE

src/if_ruby.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,21 @@
107107
# undef SIZEOF_TIME_T
108108
#endif
109109

110-
#ifdef __GNUC__
110+
#if defined(__GNUC__) || defined(__clang__)
111111
# pragma GCC diagnostic push
112112
# pragma GCC diagnostic ignored "-Wunused-parameter"
113113
#endif
114+
115+
#if defined(__clang__) && (__clang_major__ >= 21)
116+
# pragma GCC diagnostic ignored "-Wdefault-const-init-field-unsafe"
117+
#endif
118+
114119
#include <ruby.h>
115-
#ifdef __GNUC__
120+
#include <ruby/encoding.h>
121+
122+
#if defined(__GNUC__) || defined(__clang__)
116123
# pragma GCC diagnostic pop
117124
#endif
118-
#include <ruby/encoding.h>
119125

120126
// See above.
121127
#ifdef SIZEOF_TIME_T

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,8 @@ static char *(features[]) =
724724

725725
static int included_patches[] =
726726
{ /* Add new patch number below this line */
727+
/**/
728+
1729,
727729
/**/
728730
1728,
729731
/**/

0 commit comments

Comments
 (0)