ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-11-04 11:55:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Enable CMake 4 support (#2387)

Browse Source
This commit is contained in:
Ayaz Salikhov
2025-08-04 15:18:21 +01:00
committed by GitHub
parent dc18aefb33
commit a446d85297
5 changed files with 34 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.github/actions/prepare_runner/action.yml vendored
View File

@@ -18,6 +18,7 @@ runs:
ca-certificates \ ca-certificates \
ccache \ ccache \
clang-build-analyzer \ clang-build-analyzer \
cmake \
conan \ conan \
gh \ gh \
jq \ jq \
@@ -26,25 +27,6 @@ runs:
pkg-config pkg-config
echo "/opt/homebrew/opt/conan@2/bin" >> $GITHUB_PATH echo "/opt/homebrew/opt/conan@2/bin" >> $GITHUB_PATH
- name: Install CMake 3.31.6 on mac
if: ${{ runner.os == 'macOS' }}
shell: bash
run: |
# Uninstall any existing cmake
brew uninstall --formula cmake --ignore-dependencies || true
# Download specific cmake formula
FORMULA_URL="https://raw.githubusercontent.com/Homebrew/homebrew-core/b4e46db74e74a8c1650b38b1da222284ce1ec5ce/Formula/c/cmake.rb"
FORMULA_EXPECTED_SHA256="c7ec95d86f0657638835441871e77541165e0a2581b53b3dd657cf13ad4228d4"
mkdir -p /tmp/homebrew-formula
curl -s -L "$FORMULA_URL" -o /tmp/homebrew-formula/cmake.rb
echo "$FORMULA_EXPECTED_SHA256 /tmp/homebrew-formula/cmake.rb" | shasum -a 256 -c
# Install cmake from the specific formula with force flag
brew install --formula --quiet --force /tmp/homebrew-formula/cmake.rb
- name: Fix git permissions on Linux - name: Fix git permissions on Linux
if: ${{ runner.os == 'Linux' }} if: ${{ runner.os == 'Linux' }}
shell: bash shell: bash

60
conan.lock
View File

@@ -1,40 +1,40 @@
{ {
"version": "0.5", "version": "0.5",
"requires": [ "requires": [
"zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1752006674.465", "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1753981706.779",
"xxhash/0.8.2#7856c968c985b2981b707ee8f2413b2b%1752006674.334", "xxhash/0.8.2#7856c968c985b2981b707ee8f2413b2b%1753819065.475",
"xrpl/2.5.0@clio/boost-odr#f68e48da1490c0a583052e4f068ada55%1752585067.232", "xrpl/2.5.0@clio/boost-odr#f68e48da1490c0a583052e4f068ada55%1752585067.232",
"sqlite3/3.47.0#7a0904fd061f5f8a2366c294f9387830%1752006674.338", "sqlite3/3.47.0#7a0904fd061f5f8a2366c294f9387830%1753819061.365",
"soci/4.0.3#a9f8d773cd33e356b5879a4b0564f287%1752006674.465", "soci/4.0.3#a9f8d773cd33e356b5879a4b0564f287%1753981699.723",
"re2/20230301#dfd6e2bf050eb90ddd8729cfb4c844a4%1752006674.077", "re2/20230301#dfd6e2bf050eb90ddd8729cfb4c844a4%1753981682.56",
"rapidjson/cci.20220822#1b9d8c2256876a154172dc5cfbe447c6%1752006673.227", "rapidjson/cci.20220822#1b9d8c2256876a154172dc5cfbe447c6%1753787550.776",
"protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1752006673.172", "protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1753981676.835",
"openssl/1.1.1v#216374e4fb5b2e0f5ab1fb6f27b5b434%1752006673.069", "openssl/1.1.1v#216374e4fb5b2e0f5ab1fb6f27b5b434%1753819051.122",
"nudb/2.0.8#63990d3e517038e04bf529eb8167f69f%1752006673.862", "nudb/2.0.8#63990d3e517038e04bf529eb8167f69f%1753819053.382",
"minizip/1.2.13#9e87d57804bd372d6d1e32b1871517a3%1752006672.983", "minizip/1.2.13#9e87d57804bd372d6d1e32b1871517a3%1753787547.838",
"lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504%1752006672.825", "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504%1753981668.258",
"libuv/1.46.0#78565d142ac7102776256328a26cdf60%1752006672.827", "libuv/1.46.0#78565d142ac7102776256328a26cdf60%1753787545.012",
"libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1752006672.826", "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1753819046.492",
"libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1752006672.822", "libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1753981666.006",
"libarchive/3.7.6#e0453864b2a4d225f06b3304903cb2b7%1752006672.917", "libarchive/3.7.6#7e902bb4ac1d20504fb330c0dd040192%1754315758.476",
"http_parser/2.9.4#98d91690d6fd021e9e624218a85d9d97%1752006672.658", "http_parser/2.9.4#98d91690d6fd021e9e624218a85d9d97%1753787541.213",
"gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1752006671.555", "gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1753787541.538",
"grpc/1.50.1#02291451d1e17200293a409410d1c4e1%1752006671.777", "grpc/1.50.1#02291451d1e17200293a409410d1c4e1%1753981651.618",
"fmt/11.2.0#579bb2cdf4a7607621beea4eb4651e0f%1752006671.557", "fmt/11.2.0#579bb2cdf4a7607621beea4eb4651e0f%1753787537.812",
"date/3.0.3#cf28fe9c0aab99fe12da08aa42df65e1%1752006671.553", "date/3.0.3#cf28fe9c0aab99fe12da08aa42df65e1%1753819058.997",
"cassandra-cpp-driver/2.17.0#e50919efac8418c26be6671fd702540a%1752006671.654", "cassandra-cpp-driver/2.17.0#e50919efac8418c26be6671fd702540a%1753787543.297",
"c-ares/1.34.5#b78b91e7cfb1f11ce777a285bbf169c6%1752006671.554", "c-ares/1.34.5#b78b91e7cfb1f11ce777a285bbf169c6%1753981735.059",
"bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1752006671.549", "bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1753981732.795",
"boost/1.83.0#5bcb2a14a35875e328bf312e080d3562%1752006671.557", "boost/1.83.0#5bcb2a14a35875e328bf312e080d3562%1753787564.527",
"benchmark/1.8.3#1a2ce62c99e2b3feaa57b1f0c15a8c46%1752006671.408", "benchmark/1.8.3#1a2ce62c99e2b3feaa57b1f0c15a8c46%1752006671.408",
"abseil/20230802.1#f0f91485b111dc9837a68972cb19ca7b%1752006671.555" "abseil/20230802.1#f0f91485b111dc9837a68972cb19ca7b%1753981722.104"
], ],
"build_requires": [ "build_requires": [
"zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1752006674.465", "zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1753981706.779",
"protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1752006673.172", "protobuf/3.21.12#d927114e28de9f4691a6bbcdd9a529d1%1753981676.835",
"protobuf/3.21.9#64ce20e1d9ea24f3d6c504015d5f6fa8%1752006673.173", "protobuf/3.21.9#64ce20e1d9ea24f3d6c504015d5f6fa8%1753819053.54",
"cmake/3.31.7#57c3e118bcf267552c0ea3f8bee1e7d5%1752006671.64", "cmake/3.31.7#57c3e118bcf267552c0ea3f8bee1e7d5%1753819050.783",
"b2/5.3.2#7b5fabfe7088ae933fb3e78302343ea0%1752006671.407" "b2/5.3.2#7b5fabfe7088ae933fb3e78302343ea0%1753819034.304"
], ],
"python_requires": [], "python_requires": [],
"overrides": { "overrides": {

2
docker/ci/Dockerfile
View File

@@ -53,7 +53,7 @@ RUN apt-get update \
# lxml 6.0.0 is not compatible with our image # lxml 6.0.0 is not compatible with our image
'lxml<6.0.0' \ 'lxml<6.0.0' \
\ \
cmake==3.31.6 \ cmake \
conan==2.17.0 \ conan==2.17.0 \
gcovr \ gcovr \
pre-commit \ pre-commit \

2
docker/tools/Dockerfile
View File

@@ -20,7 +20,7 @@ RUN apt-get update \
software-properties-common \ software-properties-common \
wget \ wget \
&& pip3 install -q --no-cache-dir \ && pip3 install -q --no-cache-dir \
cmake==3.31.6 \ cmake \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

2
docs/build-clio.md
View File

@@ -7,7 +7,7 @@
- [Python 3.7](https://www.python.org/downloads/) - [Python 3.7](https://www.python.org/downloads/)
- [Conan 2.17.0](https://conan.io/downloads.html) - [Conan 2.17.0](https://conan.io/downloads.html)
- [CMake 3.20, <4.0](https://cmake.org/download/) - [CMake 3.20](https://cmake.org/download/)
- [**Optional**] [GCovr](https://gcc.gnu.org/onlinedocs/gcc/Gcov.html): needed for code coverage generation - [**Optional**] [GCovr](https://gcc.gnu.org/onlinedocs/gcc/Gcov.html): needed for code coverage generation
- [**Optional**] [CCache](https://ccache.dev/): speeds up compilation if you are going to compile Clio often - [**Optional**] [CCache](https://ccache.dev/): speeds up compilation if you are going to compile Clio often