Merge branch 'next' into clean-cmake

.github/workflows/build.yml

@@ -5,8 +5,9 @@ on:
       - master
       - next
   pull_request:
+    types: [ opened, reopened, synchronize, edited, ready_for_review, review_requested ]
   schedule:
-    - cron: '0 0 * * 0' # Every Sunday at 00:00
+    - cron: '0 0 * * 5' # Every Friday at 00:00
 jobs:
   distcheck:
     strategy:
@@ -15,7 +16,7 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install Linux dependencies
         if: startsWith(matrix.os, 'ubuntu')
         run: |
@@ -41,8 +42,8 @@ jobs:
           - arch: ppc64le
       fail-fast: false
     steps:
-      - uses: actions/checkout@v2
-      - uses: uraimo/run-on-arch-action@v2.0.9
+      - uses: actions/checkout@v4
+      - uses: uraimo/run-on-arch-action@v2
         name: Install dependencies and run distcheck
         id: runcmd
         with:
@@ -62,7 +63,7 @@ jobs:
   valgrind:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install dependencies
         run: |
           sudo apt-get update -y
@@ -76,7 +77,7 @@ jobs:
   coverage:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install dependencies
         run: |
           sudo apt-get update -y
@@ -102,7 +103,7 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install Linux dependencies
         if: startsWith(matrix.os, 'ubuntu')
         run: |
@@ -130,16 +131,16 @@ jobs:
       PROTOBUF_VERSION: 24.3
       ABSEIL_VERSION: "20230802.0"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ilammy/msvc-dev-cmd@v1
         with:
             arch: amd64
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         id: protobuf-cache
         with:
           path: ~/protobuf-bin
           key: ${{ env.PROTOBUF_VERSION }}-${{ matrix.shared-lib }}-${{ matrix.build-type}}
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         id: abseil-cache
         with:
           path: ~/abseil-bin

protoc-c/c_generator.h

@@ -95,7 +95,7 @@ class PROTOC_C_EXPORT CGenerator : public CodeGenerator {
                 std::string* error) const;
 
 #if GOOGLE_PROTOBUF_VERSION >= 5026000
-  uint64_t GetSupportedFeatures() const { return CodeGenerator::FEATURE_SUPPORTS_EDITIONS; }
+  uint64_t GetSupportedFeatures() const { return 0; }
   Edition GetMinimumEdition() const { return Edition::EDITION_PROTO2; }
   Edition GetMaximumEdition() const { return Edition::EDITION_PROTO3; }
 #endif