Merge branch 'ElementsProject:master' into bolt12_offer_issuer_id

Author: 21M4TW

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,10 @@
 > [!IMPORTANT]
 >
-> 25.05 FREEZE MAY 12TH: Non-bugfix PRs not ready by this date will wait for 25.08.
+> 25.05 FREEZE MAY 05TH: Non-bugfix PRs not ready by this date will wait for 25.08.
 >
-> RC1 is scheduled on _May 23rd_, RC2 on _May 26th_, ...
+> RC1 is scheduled on _May 12th_, RC2 on _May 16th_, ...
 >
-> The final release is on MAY 29TH.
+> The final release is on MAY 20TH.
 
 
 ## Checklist

.github/scripts/setup.sh

@@ -72,20 +72,17 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \
 # which comes from the same tree.  Makes sense!
 
 # And
-#   grpcio-tools-1.54.0` requires `protobuf = ">=4.21.6,<5.0dev"`
+#   grpcio-tools-1.69.0` requires `protobuf = ">=5.26.1,<6.0dev"`
 
 # Now, protoc changed to date-based releases, BUT Python protobuf
 # didn't, so Python protobuf 4.21.12 (in Ubuntu 23.04) corresponds to
 # protoc 21.12 (which, FYI, is packaged in Ubuntu as version 3.21.12).
 
-# So we're going to nail these versions as 21.12, which is what recent
-# Ubuntu has, and hopefully everyone else can get.  And this means that
-# When CI checks that no files have changed under regeneration, you won't
-# get a fail just because the dev's protoc is a different version.
+# In general protobuf version x.y.z corresponds to protoc version y.z
 
 # Honorable mention go to Matt Whitlock for spelunking this horror with me!
 
-PROTOC_VERSION=21.12
+PROTOC_VERSION=29.4
 PB_REL="https://github.com/protocolbuffers/protobuf/releases"
 curl -LO $PB_REL/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip
 sudo unzip protoc-${PROTOC_VERSION}-linux-x86_64.zip -d /usr/local/

.github/scripts/sync-rpc-cmds.py

@@ -70,7 +70,7 @@ def extract_rpc_commands(rst_content):
         commands = re.findall(
             r"\b([a-zA-Z0-9_-]+)" r"\s+<([^>]+)>\n", manpages_block.group(1)
         )
-        return [(re.sub(r"\blightning-", "", rpc_name), file_name) for rpc_name, file_name in commands]
+        return commands
     return []
 
 

.github/workflows/ci.yaml

@@ -209,7 +209,7 @@ jobs:
       - name: Check
         run: |
           tar -xaf cln-${{ matrix.CFG }}.tar.bz2
-          make -j $(nproc) check-units installcheck VALGRIND=${{ matrix.VALGRIND }}
+          eatmydata make -j $(nproc) check-units installcheck VALGRIND=${{ matrix.VALGRIND }}
 
   check-fuzz:
     name: Run fuzz regression tests
@@ -249,7 +249,7 @@ jobs:
     needs:
       - compile
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         include:
           - NAME: gcc
@@ -343,7 +343,7 @@ jobs:
         run: |
           env
           cat config.vars
-          VALGRIND=0 poetry run pytest tests/ -vvv -n ${PYTEST_PAR} ${PYTEST_OPTS}
+          VALGRIND=0 poetry run eatmydata pytest tests/ -vvv -n ${PYTEST_PAR} ${PYTEST_OPTS}
 
   integration-valgrind:
     name: Valgrind Test CLN ${{ matrix.name }}
@@ -356,7 +356,7 @@ jobs:
     needs:
       - compile
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         include:
           - NAME: Valgrind (01/10)
@@ -411,7 +411,7 @@ jobs:
           SLOW_MACHINE: 1
           TEST_DEBUG: 1
         run: |
-          VALGRIND=1 poetry run pytest tests/ -vvv -n 3 ${PYTEST_OPTS}  ${{ matrix.PYTEST_OPTS }}
+          VALGRIND=1 poetry run eatmydata pytest tests/ -vvv -n 3 ${PYTEST_OPTS}  ${{ matrix.PYTEST_OPTS }}
 
   integration-sanitizers:
     name: Sanitizers Test CLN
@@ -425,7 +425,7 @@ jobs:
     needs:
       - compile
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         include:
           - NAME: ASan/UBSan (01/10)
@@ -477,14 +477,15 @@ jobs:
 
       - name: Test
         run: |
-          poetry run pytest tests/ -vvv -n 2 ${PYTEST_OPTS}  ${{ matrix.PYTEST_OPTS }}
+          poetry run eatmydata pytest tests/ -vvv -n 2 ${PYTEST_OPTS}  ${{ matrix.PYTEST_OPTS }}
 
   update-docs-examples:
-    name: Update examples in doc schemas 
+    name: Update examples in doc schemas (disabled temporarily!)
+    if: false
     runs-on: ubuntu-22.04
     timeout-minutes: 30
     strategy:
-      fail-fast: true
+      fail-fast: false
     env:
       VALGRIND: 0
       GENERATE_EXAMPLES: 1
@@ -519,7 +520,7 @@ jobs:
           tar -xaf cln-compile-gcc.tar.bz2
       - name: Test
         run: |
-          make -j $(nproc) check-doc-examples
+          eatmydata make -j $(nproc) check-doc-examples
 
   min-btc-support:
     name: Test minimum supported BTC v${{ matrix.MIN_BTC_VERSION }} with ${{ matrix.NAME }}
@@ -531,7 +532,7 @@ jobs:
     needs:
       - compile
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         include:
           - NAME: clang
@@ -591,7 +592,7 @@ jobs:
         run: |
           env
           cat config.vars
-          VALGRIND=0 poetry run pytest tests/ -vvv -n ${PYTEST_PAR} ${PYTEST_OPTS}
+          VALGRIND=0 poetry run eatmydata pytest tests/ -vvv -n ${PYTEST_PAR} ${PYTEST_OPTS}
 
   check-flake:
     name: Check Nix Flake
@@ -615,18 +616,38 @@ jobs:
   gather:
     # A dummy task that depends on the full matrix of tests, and
     # signals successful completion. Used for the PR status to pass
-    # before merging.
+    # before merging.  Needs to run even if they failed!
     name: CI completion
     runs-on: ubuntu-22.04
     needs:
       - integration
       - check-units
       - integration-valgrind
       - integration-sanitizers
-      - update-docs-examples
       - min-btc-support
       - check-flake
+    if: ${{ always() }}
     steps:
       - name: Complete
+        env:
+          JOB_NAMES: "INTEGRATION CHECK_UNITS VALGRIND SANITIZERS BTC FLAKE"
+          INTEGRATION: ${{ needs.integration.result }}
+          CHECK_UNITS: ${{ needs['check-units'].result }}
+          VALGRIND: ${{ needs['integration-valgrind'].result }}
+          SANITIZERS: ${{ needs['integration-sanitizers'].result }}
+          DOCS: ${{ needs['update-docs-examples'].result }}
+          BTC: ${{ needs['min-btc-support'].result }}
+          FLAKE: ${{ needs['check-flake'].result }}
         run: |
-          echo CI completed successfully
+          failed=""
+          for name in $JOB_NAMES; do
+            result="${!name}"
+            echo "$name: $result"
+            if [[ "$result" != "success" ]]; then
+              failed="yes"
+            fi
+          done
+          if [[ "$failed" == "yes" ]]; then
+            echo "One or more required jobs failed"
+            exit 1
+          fi

.github/workflows/pypi.yml

@@ -16,7 +16,7 @@ on:
 jobs:
   deploy:
     name: Build and publish ${{ matrix.package }} 🐍
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 120
     strategy:
       fail-fast: true