Skip to content
This repository was archived by the owner on Oct 8, 2025. It is now read-only.

Conversation

osokin
Copy link
Contributor

@osokin osokin commented Oct 6, 2025

Proposed changes

Describe the use case and detail of the change. If this PR addresses an issue on GitHub, make sure to include a link to that issue using one of the supported keywords in this PR's description or commit message.

Checklist

Before creating a PR, run through this checklist and mark each as complete:

@ac000
Copy link
Member

ac000 commented Oct 6, 2025

  • Add a couple of CI updates
$ git range-diff 96cb5b91...afe1d706
-:  -------- > 1:  f18f98cc src/test: Fix compilation with GCC 15
-:  -------- > 2:  c1468465 ci: Enable building of the C tests on Fedora Rawhide/Alpine Edge
1:  96cb5b91 ! 3:  afe1d706 java: update tomcat distribution to its recent version 9.0.110
    @@ Metadata
      ## Commit message ##
         java: update tomcat distribution to its recent version 9.0.110
     
    +    Signed-off-by: Andrew Clayton <ac@sigsegv.uk>
    +
      ## auto/modules/java ##
     @@ auto/modules/java: cat << END > $NXT_JAVA_JARS
      static const char *nxt_java_system_jars[] = {

@ac000
Copy link
Member

ac000 commented Oct 6, 2025

The ruby failure on Alpine (Edge) Linux and Clang is due to

$ clang -I/usr/include/ruby-3.4.0/x86_64-linux-musl -I/usr/include
/ruby-3.4.0 -o ruby-clang-test ruby-clang-test.c -lruby
In file included from ruby-clang-test.c:2:
In file included from /usr/include/ruby-3.4.0/ruby.h:38:
In file included from /usr/include/ruby-3.4.0/ruby/ruby.h:28:
In file included from /usr/include/ruby-3.4.0/ruby/internal/arithmetic.h:24:
In file included from /usr/include/ruby-3.4.0/ruby/internal/arithmetic/char.h:29:
/usr/include/ruby-3.4.0/ruby/internal/core/rstring.h:398:24: warning: 
      default initialization of an object of type 'struct RString' with const
      member leaves the object uninitialized [-Wdefault-const-init-field-unsafe]
  398 |         struct RString retval;
      |                        ^
/usr/include/ruby-3.4.0/ruby/internal/core/rbasic.h:86:17: note: 
      member 'klass' declared 'const' here
   86 |     const VALUE klass;
      |                 ^

-Wdefault-const-init-field-unsafe is a new warning in clang.

We don't hit this on Fedora Rawhide with the same version of clang due
to the ruby headers there being in the system include path for which
warnings are not generated.

Anyway this is a problem for another day (probably just disable this
warning on clang) and is unrelated to this pull-request.

ac000 and others added 3 commits October 6, 2025 19:42
Tag some missed character arrays with NXT_NONSTRING.

See commit d9c2fd7 ("Tag various character arrays with NXT_NONSTRING")
for details.

Signed-off-by: Andrew Clayton <ac@sigsegv.uk>
Signed-off-by: Andrew Clayton <ac@sigsegv.uk>
Signed-off-by: Andrew Clayton <ac@sigsegv.uk>
@ac000
Copy link
Member

ac000 commented Oct 6, 2025

  • Rebase with master
$ git range-diff afe1d706...f41bea35
-:  -------- > 1:  18d8e542 do not exclude unit-openapi.yaml from releases
1:  f18f98cc = 2:  041154a7 src/test: Fix compilation with GCC 15
2:  c1468465 = 3:  7a83a19f ci: Enable building of the C tests on Fedora Rawhide/Alpine Edge
3:  afe1d706 = 4:  f41bea35 java: update tomcat distribution to its recent version 9.0.110

@ac000 ac000 merged commit f41bea3 into nginx:master Oct 6, 2025
23 of 24 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants