Merge branch 'develop' into bthomee/ccache

Update name of step
2025-12-06 17:27:55 +00:00 · 2025-12-04 09:45:00 -05:00 · 2025-12-04 08:33:02 -05:00 · 2025-12-03 18:16:04 -05:00 · 2025-12-03 17:54:47 -05:00 · 2025-12-03 17:41:42 -05:00
9 changed files with 97 additions and 102 deletions
--- a/.github/scripts/strategy-matrix/linux.json
+++ b/.github/scripts/strategy-matrix/linux.json
@@ -15,196 +15,196 @@
      "distro_version": "bookworm",
      "compiler_name": "gcc",
      "compiler_version": "12",
-      "image_sha": "0525eae"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "debian",
      "distro_version": "bookworm",
      "compiler_name": "gcc",
      "compiler_version": "13",
-      "image_sha": "0525eae"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "debian",
      "distro_version": "bookworm",
      "compiler_name": "gcc",
      "compiler_version": "14",
-      "image_sha": "0525eae"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "debian",
      "distro_version": "bookworm",
      "compiler_name": "gcc",
      "compiler_version": "15",
-      "image_sha": "0525eae"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "debian",
      "distro_version": "bookworm",
      "compiler_name": "clang",
      "compiler_version": "16",
-      "image_sha": "0525eae"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "debian",
      "distro_version": "bookworm",
      "compiler_name": "clang",
      "compiler_version": "17",
-      "image_sha": "0525eae"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "debian",
      "distro_version": "bookworm",
      "compiler_name": "clang",
      "compiler_version": "18",
-      "image_sha": "0525eae"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "debian",
      "distro_version": "bookworm",
      "compiler_name": "clang",
      "compiler_version": "19",
-      "image_sha": "0525eae"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "debian",
      "distro_version": "bookworm",
      "compiler_name": "clang",
      "compiler_version": "20",
-      "image_sha": "0525eae"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "debian",
      "distro_version": "trixie",
      "compiler_name": "gcc",
      "compiler_version": "14",
-      "image_sha": "0525eae"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "debian",
      "distro_version": "trixie",
      "compiler_name": "gcc",
      "compiler_version": "15",
-      "image_sha": "0525eae"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "debian",
      "distro_version": "trixie",
      "compiler_name": "clang",
      "compiler_version": "20",
-      "image_sha": "0525eae"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "debian",
      "distro_version": "trixie",
      "compiler_name": "clang",
      "compiler_version": "21",
-      "image_sha": "0525eae"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "rhel",
      "distro_version": "8",
      "compiler_name": "gcc",
      "compiler_version": "14",
-      "image_sha": "e1782cd"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "rhel",
      "distro_version": "8",
      "compiler_name": "clang",
      "compiler_version": "any",
-      "image_sha": "e1782cd"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "rhel",
      "distro_version": "9",
      "compiler_name": "gcc",
      "compiler_version": "12",
-      "image_sha": "e1782cd"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "rhel",
      "distro_version": "9",
      "compiler_name": "gcc",
      "compiler_version": "13",
-      "image_sha": "e1782cd"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "rhel",
      "distro_version": "9",
      "compiler_name": "gcc",
      "compiler_version": "14",
-      "image_sha": "e1782cd"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "rhel",
      "distro_version": "9",
      "compiler_name": "clang",
      "compiler_version": "any",
-      "image_sha": "e1782cd"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "rhel",
      "distro_version": "10",
      "compiler_name": "gcc",
      "compiler_version": "14",
-      "image_sha": "e1782cd"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "rhel",
      "distro_version": "10",
      "compiler_name": "clang",
      "compiler_version": "any",
-      "image_sha": "e1782cd"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "ubuntu",
      "distro_version": "jammy",
      "compiler_name": "gcc",
      "compiler_version": "12",
-      "image_sha": "e1782cd"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "ubuntu",
      "distro_version": "noble",
      "compiler_name": "gcc",
      "compiler_version": "13",
-      "image_sha": "e1782cd"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "ubuntu",
      "distro_version": "noble",
      "compiler_name": "gcc",
      "compiler_version": "14",
-      "image_sha": "e1782cd"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "ubuntu",
      "distro_version": "noble",
      "compiler_name": "clang",
      "compiler_version": "16",
-      "image_sha": "e1782cd"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "ubuntu",
      "distro_version": "noble",
      "compiler_name": "clang",
      "compiler_version": "17",
-      "image_sha": "e1782cd"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "ubuntu",
      "distro_version": "noble",
      "compiler_name": "clang",
      "compiler_version": "18",
-      "image_sha": "e1782cd"
+      "image_sha": "ca4517d"
    },
    {
      "distro_name": "ubuntu",
      "distro_version": "noble",
      "compiler_name": "clang",
      "compiler_version": "19",
-      "image_sha": "e1782cd"
+      "image_sha": "ca4517d"
    }
  ],
  "build_type": ["Debug", "Release"],
--- a/.github/workflows/reusable-build-test-config.yml
+++ b/.github/workflows/reusable-build-test-config.yml
@@ -116,6 +116,16 @@ jobs:
            ${CMAKE_ARGS} \
            ..

+      - name: Restore build objects (Linux)
+        if: ${{ runner.os == 'Linux' }}
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{ inputs.config_name }}
+
+      - name: Print out ccache statistics before building
+        run: ccache -s
+
      - name: Build the binary
        working-directory: ${{ inputs.build_dir }}
        env:
@@ -129,14 +139,22 @@ jobs:
            --parallel "${BUILD_NPROC}" \
            --target "${CMAKE_TARGET}"

+      - name: Print out ccache statistics after building
+        run: ccache -s
+
+      - name: Save build objects (Linux)
+        if: ${{ runner.os == 'Linux' }}
+        uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+        with:
+          path: ${{ env.CCACHE_DIR }}
+          key: ${{ inputs.config_name }}
+
      - name: Upload rippled artifact (Linux)
        if: ${{ github.repository_owner == 'XRPLF' && runner.os == 'Linux' }}
        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        env:
-          BUILD_DIR: ${{ inputs.build_dir }}
        with:
          name: rippled-${{ inputs.config_name }}
-          path: ${{ env.BUILD_DIR }}/rippled
+          path: ${{ inputs.build_dir }}/rippled
          retention-days: 3
          if-no-files-found: error

--- a/.gitignore
+++ b/.gitignore
@@ -111,6 +111,3 @@ bld.rippled/

 # Suggested in-tree build directory
 /.build*/
-
-# Locally patched Conan recipes
-external/conan-center-index/
--- a/BUILD.md
+++ b/BUILD.md
@@ -141,37 +141,21 @@ Alternatively, you can pull the patched recipes into the repository and use them
 locally:

 ```bash
-# Extract the version number from the lockfile.
-function extract_version {
-  version=$(cat conan.lock | sed -nE "s@.+${1}/(.+)#.+@\1@p" | head -n1)
-  echo ${version}
-}
-
-# Define which recipes to export.
-recipes=(ed25519 grpc secp256k1 snappy soci)
-
-# Selectively check out the recipes from our CCI fork.
 cd external
-mkdir -p conan-center-index
-cd conan-center-index
 git init
 git remote add origin git@github.com:XRPLF/conan-center-index.git
 git sparse-checkout init
-for recipe in ${recipes[@]}; do
-  echo "Checking out ${recipe}..."
-  git sparse-checkout add recipes/${recipe}/all
-done
+git sparse-checkout set recipes/ed25519
+git sparse-checkout add recipes/secp256k1
+git sparse-checkout add recipes/snappy
+git sparse-checkout add recipes/soci
 git fetch origin master
 git checkout master
-cd ../..
-
-# Export the recipes into the local cache.
-for recipe in ${recipes[@]}; do
-  version=$(extract_version ${recipe})
-  echo "Exporting ${recipe}/${version}..."
-  conan export --version $(extract_version ${recipe}) \
-    external/conan-center-index/recipes/${recipe}/all
-done
+conan export --version 2015.03 recipes/ed25519/all
+conan export --version 0.7.0 recipes/secp256k1/all
+conan export --version 1.1.10 recipes/snappy/all
+conan export --version 4.0.3 recipes/soci/all
+rm -rf .git
 ```

 In the case we switch to a newer version of a dependency that still requires a
@@ -401,6 +385,19 @@ tools.build:cxxflags=['-DBOOST_ASIO_DISABLE_CONCEPTS']
   `--settings build_type=$BUILD_TYPE` or in the profile itself,
   under the section `[settings]` with the key `build_type`.

+   If you are using a Microsoft Visual C++ compiler,
+   then you will need to ensure consistency between the `build_type` setting
+   and the `compiler.runtime` setting.
+
+   When `build_type` is `Release`, `compiler.runtime` should be `MT`.
+
+   When `build_type` is `Debug`, `compiler.runtime` should be `MTd`.
+
+   ```
+   conan install .. --output-folder . --build missing --settings build_type=Release --settings compiler.runtime=MT
+   conan install .. --output-folder . --build missing --settings build_type=Debug --settings compiler.runtime=MTd
+   ```
+
 3. Configure CMake and pass the toolchain file generated by Conan, located at
   `$OUTPUT_FOLDER/build/generators/conan_toolchain.cmake`.

--- a/cmake/XrplCompiler.cmake
+++ b/cmake/XrplCompiler.cmake
@@ -2,6 +2,12 @@
   setup project-wide compiler settings
 #]===================================================================]

+find_program(CCACHE_PATH "ccache")
+if (CCACHE_PATH)
+  set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PATH}")
+  message(STATUS "Using ccache: ${CCACHE_PATH}")
+endif ()
+
 #[=========================================================[
   TODO some/most of these common settings belong in a
   toolchain file, especially the ABI-impacting ones
--- a/conan.lock
+++ b/conan.lock
@@ -9,7 +9,7 @@
        "secp256k1/0.7.0#9210e4c655d0a665400378a663960d17%1764261276.764",
        "rocksdb/10.5.1#4a197eca381a3e5ae8adf8cffa5aacd0%1762797952.535",
        "re2/20230301#ca3b241baec15bd31ea9187150e0b333%1764175362.029",
-        "protobuf/6.32.1#f481fd276fc23a33b85a3ed1e898b693%1759134873.45",
+        "protobuf/3.21.12#44ee56c0a6eea0c19aeeaca680370b88%1764175361.456",
        "openssl/3.5.4#a1d5835cc6ed5c5b8f3cd5b9b5d24205%1760106486.594",
        "nudb/2.0.9#fb8dfd1a5557f5e0528114c2da17721e%1763150366.909",
        "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504%1756234228.999",
@@ -17,19 +17,19 @@
        "libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1756230911.03",
        "libarchive/3.8.1#ffee18995c706e02bf96e7a2f7042e0d%1764175360.142",
        "jemalloc/5.3.0#e951da9cf599e956cebc117880d2d9f8%1729241615.244",
-        "grpc/1.72.0#f244a57bff01e708c55a1100b12e1589%1763158050.628",
-        "ed25519/2015.03#ae761bdc52730a843f0809bdf6c1b1f6%1764270189.893",
+        "grpc/1.50.1#02291451d1e17200293a409410d1c4e1%1756234248.958",
+        "ed25519/2015.03#17c1f1910e769f368025267a53c23c13%1764259445.491",
        "doctest/2.4.12#eb9fb352fb2fdfc8abb17ec270945165%1762797941.757",
        "date/3.0.4#862e11e80030356b53c2c38599ceb32b%1763584497.32",
        "c-ares/1.34.5#5581c2b62a608b40bb85d965ab3ec7c8%1764175359.429",
        "bzip2/1.0.8#c470882369c2d95c5c77e970c0c7e321%1764175359.429",
        "boost/1.88.0#8852c0b72ce8271fb8ff7c53456d4983%1756223752.326",
-        "abseil/20250127.0#9e8e8cfc89a1324139fc0ee3bd4d8c8c%1753819045.301"
+        "abseil/20230802.1#90ba607d4ee8fb5fb157c3db540671fc%1764175359.429"
    ],
    "build_requires": [
        "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1756234269.497",
        "strawberryperl/5.32.1.1#707032463aa0620fa17ec0d887f5fe41%1756234281.733",
-        "protobuf/6.32.1#f481fd276fc23a33b85a3ed1e898b693%1759134873.45",
+        "protobuf/3.21.12#44ee56c0a6eea0c19aeeaca680370b88%1764175361.456",
        "nasm/2.16.01#31e26f2ee3c4346ecd347911bd126904%1756234232.901",
        "msys2/cci.latest#5b73b10144f73cc5bfe0572ed9be39e1%1751977009.857",
        "m4/1.4.19#70dc8bbb33e981d119d2acc0175cf381%1763158052.846",
@@ -37,13 +37,13 @@
        "cmake/3.31.10#313d16a1aa16bbdb2ca0792467214b76%1764175359.429",
        "b2/5.3.3#107c15377719889654eb9a162a673975%1756234226.28",
        "automake/1.16.5#b91b7c384c3deaa9d535be02da14d04f%1755524470.56",
-        "autoconf/2.71#51077f068e61700d65bb05541ea1e4b0%1731054366.86",
-        "abseil/20250127.0#9e8e8cfc89a1324139fc0ee3bd4d8c8c%1753819045.301"
+        "autoconf/2.71#51077f068e61700d65bb05541ea1e4b0%1731054366.86"
    ],
    "python_requires": [],
    "overrides": {
-        "protobuf/5.27.0": [
-            "protobuf/6.32.1"
+        "protobuf/3.21.12": [
+            null,
+            "protobuf/3.21.12"
        ],
        "lz4/1.9.4": [
            "lz4/1.10.0"
--- a/conan/profiles/default
+++ b/conan/profiles/default
@@ -20,6 +20,12 @@ compiler.libcxx={{detect_api.detect_libcxx(compiler, version, compiler_exe)}}
 {% endif %}

 [conf]
+{% if compiler == "clang" and compiler_version >= 19 %}
+grpc/1.50.1:tools.build:cxxflags+=['-Wno-missing-template-arg-list-after-template-kw']
+{% endif %}
+{% if compiler == "apple-clang" and compiler_version >= 17 %}
+grpc/1.50.1:tools.build:cxxflags+=['-Wno-missing-template-arg-list-after-template-kw']
+{% endif %}
 {% if compiler == "gcc" and compiler_version < 13 %}
 tools.build:cxxflags+=['-Wno-restrict']
 {% endif %}
--- a/conanfile.py
+++ b/conanfile.py
@@ -29,7 +29,7 @@ class Xrpl(ConanFile):

    requires = [
        "ed25519/2015.03",
-        "grpc/1.72.0",
+        "grpc/1.50.1",
        "libarchive/3.8.1",
        "nudb/2.0.9",
        "openssl/3.5.4",
@@ -43,7 +43,7 @@ class Xrpl(ConanFile):
    ]

    tool_requires = [
-        "protobuf/6.32.1",
+        "protobuf/3.21.12",
    ]

    default_options = {
@@ -61,16 +61,6 @@ class Xrpl(ConanFile):
        "ed25519/*:shared": False,
        "grpc/*:shared": False,
        "grpc/*:secure": True,
-        "grpc/*:codegen": True,
-        "grpc/*:cpp_plugin": True,
-        "grpc/*:csharp_ext": False,
-        "grpc/*:csharp_plugin": False,
-        "grpc/*:node_plugin": False,
-        "grpc/*:objective_c_plugin": False,
-        "grpc/*:php_plugin": False,
-        "grpc/*:python_plugin": False,
-        "grpc/*:ruby_plugin": False,
-        "grpc/*:otel_plugin": False,
        "libarchive/*:shared": False,
        "libarchive/*:with_acl": False,
        "libarchive/*:with_bzip2": False,
@@ -128,7 +118,7 @@ class Xrpl(ConanFile):
        self.requires("boost/1.88.0", force=True, **transitive_headers_opt)
        self.requires("date/3.0.4", **transitive_headers_opt)
        self.requires("lz4/1.10.0", force=True)
-        self.requires("protobuf/6.32.1", force=True)
+        self.requires("protobuf/3.21.12", force=True)
        self.requires("sqlite3/3.49.1", force=True)
        if self.options.jemalloc:
            self.requires("jemalloc/5.3.0")
--- a/src/xrpld/app/misc/detail/ValidatorSite.cpp
+++ b/src/xrpld/app/misc/detail/ValidatorSite.cpp
@@ -129,12 +129,7 @@ ValidatorSite::load(
    {
        try
        {
-            // This is not super efficient, but it doesn't happen often.
-            bool found = std::ranges::any_of(sites_, [&uri](auto const& site) {
-                return site.loadedResource->uri == uri;
-            });
-            if (!found)
-                sites_.emplace_back(uri);
+            sites_.emplace_back(uri);
        }
        catch (std::exception const& e)
        {
@@ -196,17 +191,6 @@ ValidatorSite::setTimer(
    std::lock_guard<std::mutex> const& site_lock,
    std::lock_guard<std::mutex> const& state_lock)
 {
-    if (!sites_.empty() &&  //
-        std::ranges::all_of(sites_, [](auto const& site) {
-            return site.lastRefreshStatus.has_value();
-        }))
-    {
-        // If all of the sites have been handled at least once (including
-        // errors and timeouts), call missingSite, which will load the cache
-        // files for any lists that are still unavailable.
-        missingSite(site_lock);
-    }
-
    auto next = std::min_element(
        sites_.begin(), sites_.end(), [](Site const& a, Site const& b) {
            return a.nextRefresh < b.nextRefresh;
@@ -319,16 +303,13 @@ ValidatorSite::onRequestTimeout(std::size_t siteIdx, error_code const& ec)
        // processes a network error. Usually, this function runs first,
        // but on extremely rare occasions, the response handler can run
        // first, which will leave activeResource empty.
-        auto& site = sites_[siteIdx];
+        auto const& site = sites_[siteIdx];
        if (site.activeResource)
            JLOG(j_.warn()) << "Request for " << site.activeResource->uri
                            << " took too long";
        else
            JLOG(j_.error()) << "Request took too long, but a response has "
                                "already been processed";
-        if (!site.lastRefreshStatus)
-            site.lastRefreshStatus.emplace(Site::Status{
-                clock_type::now(), ListDisposition::invalid, "timeout"});
    }

    std::lock_guard lock_state{state_mutex_};
Author	SHA1	Message	Date
Bart	a07399d2f1	Merge branch 'develop' into bthomee/ccache	2025-12-04 09:45:00 -05:00
Bart	73ef462422	Merge branch 'develop' into bthomee/ccache	2025-12-04 08:33:02 -05:00
Bart	ac71a5fcc8	Update name of step	2025-12-03 18:16:04 -05:00
Bart	efd2a33ecb	Use env var for the ccache dir	2025-12-03 17:54:47 -05:00
Bart	5ca0577739	Cache the ccache dir	2025-12-03 17:41:42 -05:00
Bart	89ea91af5d	Update CI images	2025-12-03 17:18:49 -05:00
Bart	30d2f70744	Print ccache statistics	2025-12-03 17:00:52 -05:00
Bart	aec131bcbb	ci: Use ccache to cache build objects for speeding up building	2025-12-03 16:50:35 -05:00