diff --git a/.github/scripts/conan/regenerate_lockfile.sh b/.github/scripts/conan/regenerate_lockfile.sh index e237bbfdd..b842ee986 100755 --- a/.github/scripts/conan/regenerate_lockfile.sh +++ b/.github/scripts/conan/regenerate_lockfile.sh @@ -14,7 +14,7 @@ export CONAN_HOME="$TEMP_DIR" # Ensure that the xrplf remote is the first to be consulted, so any recipes we # patched are used. We also add it there to not created huge diff when the # official Conan Center Index is updated. -conan remote add --force --index 0 xrplf https://conan.ripplex.io +conan remote add --force --index 0 xrplf https://conan.xrplf.org/repository/conan/ # Delete any existing lockfile. rm -f conan.lock diff --git a/.github/workflows/upload-conan-deps.yml b/.github/workflows/upload-conan-deps.yml index 7a725a0d1..764212086 100644 --- a/.github/workflows/upload-conan-deps.yml +++ b/.github/workflows/upload-conan-deps.yml @@ -107,10 +107,12 @@ jobs: - name: Log into Conan remote if: ${{ github.repository == 'XRPLF/clio' && github.event_name != 'pull_request' }} - run: conan remote login -p ${{ secrets.CONAN_PASSWORD }} xrplf ${{ secrets.CONAN_USERNAME }} + run: conan remote login -p ${{ secrets.NEXUS_REMOTE_PASSWORD }} xrplf ${{ secrets.NEXUS_REMOTE_USERNAME }} - name: Upload Conan packages if: ${{ github.repository == 'XRPLF/clio' && github.event_name != 'pull_request' && github.event_name != 'schedule' }} env: FORCE_OPTION: ${{ github.event.inputs.force_upload == 'true' && '--force' || '' }} + CONAN_LOGIN_USERNAME_XRPLF: ${{ secrets.NEXUS_REMOTE_USERNAME }} + CONAN_PASSWORD_XRPLF: ${{ secrets.NEXUS_REMOTE_PASSWORD }} run: conan upload "*" -r=xrplf --confirm ${FORCE_OPTION} diff --git a/conan.lock b/conan.lock index 319857dc7..2b229275c 100644 --- a/conan.lock +++ b/conan.lock @@ -1,52 +1,57 @@ { "version": "0.5", "requires": [ - "zlib/1.3.2#1cb806da49011867778ffb6ac7190fcb%1778091116.056", - "xxhash/0.8.3#681d36a0a6111fc56e5e45ea182c19cc%1765850149.987", - "xrpl/3.2.0#c3c124909c6461012758a4fab7c90cd5%1781569913.756", - "sqlite3/3.53.0#324ada52333108388a9a6108bfa96734%1778091117.311", - "spdlog/1.17.0#bcbaaf7147bda6ad24ffbd1ac3d7142c%1768312128.781", - "soci/4.0.3#fe32b9ad5eb47e79ab9e45a68f363945%1774450067.231", - "snappy/1.1.10#968fef506ff261592ec30c574d4a7809%1765850147.878", - "secp256k1/0.7.1#481881709eb0bdd0185a12b912bbe8ad%1770910500.329", - "rocksdb/10.5.1#4a197eca381a3e5ae8adf8cffa5aacd0%1765850186.86", - "re2/20251105#8579cfd0bda4daf0683f9e3898f964b4%1774398111.888", - "rapidjson/cci.20220822#1b9d8c2256876a154172dc5cfbe447c6%1754325007.656", - "protobuf/6.33.5#d96d52ba5baaaa532f47bda866ad87a5%1774467363.12", - "openssl/3.6.2#4789bbf131b77d0515d15e094c8f697f%1778071755.506", - "nudb/2.0.9#11149c73f8f2baff9a0198fe25971fc7%1775040983.408", - "minizip/1.2.13#9e87d57804bd372d6d1e32b1871517a3%1754325004.374", - "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504%1765850143.914", - "libuv/1.46.0#dc28c1f653fa197f00db5b577a6f6011%1754325003.592", - "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1765842973.492", - "libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1765842973.03", - "libarchive/3.8.7#c446109bd1f1d8ba7936c94189bc50e6%1778091117.848", - "http_parser/2.9.4#98d91690d6fd021e9e624218a85d9d97%1754325001.385", - "gtest/1.17.0#5224b3b3ff3b4ce1133cbdd27d53ee7d%1768312129.152", - "grpc/1.78.1#b1a9e74b145cc471bed4dc64dc6eb2c1%1774467387.342", - "fmt/12.1.0#50abab23274d56bb8f42c94b3b9a40c7%1763984116.926", - "ed25519/2015.03#ae761bdc52730a843f0809bdf6c1b1f6%1765850143.772", - "date/3.0.4#862e11e80030356b53c2c38599ceb32b%1765850143.772", - "cassandra-cpp-driver/2.17.0#bd3934138689482102c265d01288a316%1764175359.611", - "c-ares/1.34.6#545240bb1c40e2cacd4362d6b8967650%1774439234.681", - "bzip2/1.0.8#c470882369c2d95c5c77e970c0c7e321%1765850143.837", - "boost/1.91.0#ea540ca2133d831b560036aa24dece3c%1778091165.282", + "zlib/1.3.2#1cb806da49011867778ffb6ac7190fcb%1782392402.122708", + "xxhash/0.8.3#681d36a0a6111fc56e5e45ea182c19cc%1782392402.420688", + "xrpl/3.2.0#c3c124909c6461012758a4fab7c90cd5%1782492037.328253", + "sqlite3/3.53.0#324ada52333108388a9a6108bfa96734%1782392403.185447", + "spdlog/1.17.0#bcbaaf7147bda6ad24ffbd1ac3d7142c%1767636069.964", + "soci/4.0.3#e726491a03468795453f7c83fc924a96%1782392402.679521", + "snappy/1.1.10#968fef506ff261592ec30c574d4a7809%1782307151.633168", + "secp256k1/0.7.1#b1f450b7f78a36fff75bb6934a356f3a%1782338841.3729", + "rocksdb/10.5.1#4a197eca381a3e5ae8adf8cffa5aacd0%1782392413.075713", + "re2/20251105#8579cfd0bda4daf0683f9e3898f964b4%1782392402.431897", + "rapidjson/cci.20220822#1b9d8c2256876a154172dc5cfbe447c6%1705070244.747", + "protobuf/6.33.5#ff253ead763bd8d9904a52979cd21e81%1782392410.233933", + "openssl/3.6.3#1163d4ddc603907084d08a6a0c6e580f%1782307150.583886", + "nudb/2.0.9#11149c73f8f2baff9a0198fe25971fc7%1782392402.297166", + "minizip/1.2.13#64dfec2ee447ab6c0c7eab967815a762%1781620490.148", + "lz4/1.10.0#982d9b673900f665a1da109e09c17cab%1782392402.164188", + "libuv/1.46.0#e1a592bf7c0f37802889ca2c795fb26c%1764745187.942", + "libiconv/1.17#9923bc6dc6f106646d6967e0039a5ada%1782392792.775744", + "libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1782392402.420732", + "libarchive/3.8.7#c446109bd1f1d8ba7936c94189bc50e6%1782392403.066892", + "http_parser/2.9.4#98d91690d6fd021e9e624218a85d9d97%1743410856.678", + "gtest/1.17.0#5224b3b3ff3b4ce1133cbdd27d53ee7d%1782392402.791979", + "grpc/1.78.1#b1a9e74b145cc471bed4dc64dc6eb2c1%1772623605.068", + "fmt/12.1.0#50abab23274d56bb8f42c94b3b9a40c7%1761885265.231", + "ed25519/2015.03#ae761bdc52730a843f0809bdf6c1b1f6%1782307148.15562", + "date/3.0.4#862e11e80030356b53c2c38599ceb32b%1782392402.538492", + "cassandra-cpp-driver/2.17.0#bd3934138689482102c265d01288a316%1764097402.445", + "c-ares/1.34.6#545240bb1c40e2cacd4362d6b8967650%1782392402.681654", + "bzip2/1.0.8#c470882369c2d95c5c77e970c0c7e321%1782392402.296732", + "boost/1.91.0#ea540ca2133d831b560036aa24dece3c%1782392419.475605", "benchmark/1.9.5#b885dc73ad67b40a55d45684d1c88ad1%1774363287.434", - "abseil/20250127.0#bb0baf1f362bc4a725a24eddd419b8f7%1774365460.196" + "abseil/20250127.0#bb0baf1f362bc4a725a24eddd419b8f7%1782307147.395833" ], "build_requires": [ - "zlib/1.3.2#1cb806da49011867778ffb6ac7190fcb%1778091116.056", - "protobuf/6.33.5#d96d52ba5baaaa532f47bda866ad87a5%1774467363.12", - "cmake/4.3.0#b939a42e98f593fb34d3a8c5cc860359%1774439249.183", - "cmake/3.31.11#f325c933f618a1fcebc1e1c0babfd1ba%1774439246.719", - "b2/5.4.2#ffd6084a119587e70f11cd45d1a386e2%1774439233.447", - "abseil/20250127.0#bb0baf1f362bc4a725a24eddd419b8f7%1774365460.196" + "zlib/1.3.2#1cb806da49011867778ffb6ac7190fcb%1782392402.122708", + "protobuf/6.33.5#ff253ead763bd8d9904a52979cd21e81%1782392410.233933", + "cmake/4.3.3#840cf00ea09777e05c2050a50a82c722%1782392418.696091", + "b2/5.4.2#ffd6084a119587e70f11cd45d1a386e2%1782392402.624226", + "abseil/20250127.0#bb0baf1f362bc4a725a24eddd419b8f7%1782307147.395833" ], "python_requires": [], "overrides": { + "openssl/[>=1.1 <4]": [ + "openssl/3.6.3" + ], "zlib/[>=1.2.11 <2]": [ "zlib/1.3.2#1cb806da49011867778ffb6ac7190fcb" ], + "openssl/3.6.2": [ + "openssl/3.6.3#1163d4ddc603907084d08a6a0c6e580f" + ], "zlib/1.3.2": [ null, "zlib/1.3.2#1cb806da49011867778ffb6ac7190fcb" @@ -70,7 +75,7 @@ "boost/1.91.0" ], "lz4/[>=1.9.4 <2]": [ - "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504" + "lz4/1.10.0#982d9b673900f665a1da109e09c17cab" ] }, "config_requires": [] diff --git a/conan/init.sh b/conan/init.sh index 3c79f12ee..625d16d78 100755 --- a/conan/init.sh +++ b/conan/init.sh @@ -10,7 +10,7 @@ PROFILES_DIR="$CONAN_DIR/profiles" rm -rf "$CONAN_DIR" -conan remote add --index 0 --force xrplf https://conan.ripplex.io +conan remote add --index 0 --force xrplf https://conan.xrplf.org/repository/conan/ cp "$CURRENT_DIR/global.conf" "$CONAN_DIR/global.conf" diff --git a/conanfile.py b/conanfile.py index 336653caa..8c146174e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -47,7 +47,7 @@ class ClioConan(ConanFile): # So they must be direct requirements of clio to get their include dirs; # the version pins match xrpl's, so this does not change any package_id. self.requires("grpc/1.78.1") - self.requires("openssl/3.6.2") + self.requires("openssl/3.6.3", force=True) # Pin the remaining transitive deps to the exact versions xrpl uses. # override=True only sets the version when the package appears # transitively (it does not make them direct deps), and matches xrpl's diff --git a/docs/build-clio.md b/docs/build-clio.md index 5b01b9b25..341cc0aec 100644 --- a/docs/build-clio.md +++ b/docs/build-clio.md @@ -90,7 +90,7 @@ core.upload:parallel={{os.cpu_count()}} Make sure artifactory is setup with Conan. ```sh -conan remote add --index 0 xrplf https://conan.ripplex.io +conan remote add --index 0 xrplf https://conan.xrplf.org/repository/conan/ ``` Now you should be able to download the prebuilt dependencies (including `xrpl` package) on supported platforms.