From 07c64f07f02cedf9eeb185fc7c28e2d6711fc113 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Thu, 25 Jun 2026 15:47:55 +0100 Subject: [PATCH] chore: Revert "build: Switch to a new conan XRPLF remote (#7622)" (#7623) --- .github/actions/setup-conan/action.yml | 2 +- .github/workflows/on-pr.yml | 4 +- .github/workflows/on-tag.yml | 4 +- .github/workflows/on-trigger.yml | 4 +- .github/workflows/reusable-upload-recipe.yml | 20 ++++-- .github/workflows/upload-conan-deps.yml | 6 +- BUILD.md | 2 +- conan.lock | 64 ++++++++++---------- conan/lockfile/regenerate.sh | 2 +- conanfile.py | 4 +- docs/build/advanced_conan.md | 2 +- 11 files changed, 60 insertions(+), 54 deletions(-) diff --git a/.github/actions/setup-conan/action.yml b/.github/actions/setup-conan/action.yml index e8a548cfce..0dd22f0d92 100644 --- a/.github/actions/setup-conan/action.yml +++ b/.github/actions/setup-conan/action.yml @@ -9,7 +9,7 @@ inputs: remote_url: description: "The URL of the Conan endpoint to use." required: false - default: https://conan.xrplf.org/repository/conan/ + default: https://conan.ripplex.io runs: using: composite diff --git a/.github/workflows/on-pr.yml b/.github/workflows/on-pr.yml index 2ad0641863..0c9eeda712 100644 --- a/.github/workflows/on-pr.yml +++ b/.github/workflows/on-pr.yml @@ -154,8 +154,8 @@ jobs: if: ${{ github.repository == 'XRPLF/rippled' && needs.should-run.outputs.go == 'true' && github.event_name == 'pull_request' && startsWith(github.event.pull_request.base.ref, 'release') }} uses: ./.github/workflows/reusable-upload-recipe.yml secrets: - remote_username: ${{ secrets.NEXUS_REMOTE_USERNAME }} - remote_password: ${{ secrets.NEXUS_REMOTE_PASSWORD }} + remote_username: ${{ secrets.CONAN_REMOTE_USERNAME }} + remote_password: ${{ secrets.CONAN_REMOTE_PASSWORD }} notify-clio: needs: upload-recipe diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index abedc13d69..42d5827cab 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -20,8 +20,8 @@ jobs: if: ${{ github.repository == 'XRPLF/rippled' }} uses: ./.github/workflows/reusable-upload-recipe.yml secrets: - remote_username: ${{ secrets.NEXUS_REMOTE_USERNAME }} - remote_password: ${{ secrets.NEXUS_REMOTE_PASSWORD }} + remote_username: ${{ secrets.CONAN_REMOTE_USERNAME }} + remote_password: ${{ secrets.CONAN_REMOTE_PASSWORD }} build-test: if: ${{ github.repository == 'XRPLF/rippled' }} diff --git a/.github/workflows/on-trigger.yml b/.github/workflows/on-trigger.yml index 5f018cb12c..063cdbff7f 100644 --- a/.github/workflows/on-trigger.yml +++ b/.github/workflows/on-trigger.yml @@ -98,8 +98,8 @@ jobs: if: ${{ github.repository == 'XRPLF/rippled' && github.event_name == 'push' && github.ref == 'refs/heads/develop' }} uses: ./.github/workflows/reusable-upload-recipe.yml secrets: - remote_username: ${{ secrets.NEXUS_REMOTE_USERNAME }} - remote_password: ${{ secrets.NEXUS_REMOTE_PASSWORD }} + remote_username: ${{ secrets.CONAN_REMOTE_USERNAME }} + remote_password: ${{ secrets.CONAN_REMOTE_PASSWORD }} package: needs: build-test diff --git a/.github/workflows/reusable-upload-recipe.yml b/.github/workflows/reusable-upload-recipe.yml index feeee0a621..a18f76796a 100644 --- a/.github/workflows/reusable-upload-recipe.yml +++ b/.github/workflows/reusable-upload-recipe.yml @@ -14,7 +14,7 @@ on: description: "The URL of the Conan endpoint to use." required: false type: string - default: https://conan.xrplf.org/repository/conan/ + default: https://conan.ripplex.io secrets: remote_username: @@ -41,10 +41,6 @@ jobs: upload: runs-on: ubuntu-latest container: ghcr.io/xrplf/xrpld/nix-ubuntu:sha-e29b523 - env: - REMOTE_NAME: ${{ inputs.remote_name }} - CONAN_LOGIN_USERNAME_XRPLF: ${{ secrets.remote_username }} - CONAN_PASSWORD_XRPLF: ${{ secrets.remote_password }} steps: - name: Checkout repository uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 @@ -60,9 +56,15 @@ jobs: remote_url: ${{ inputs.remote_url }} - name: Log into Conan remote - run: conan remote login "${REMOTE_NAME}" "${CONAN_LOGIN_USERNAME_XRPLF}" --password "${CONAN_PASSWORD_XRPLF}" + env: + REMOTE_NAME: ${{ inputs.remote_name }} + REMOTE_USERNAME: ${{ secrets.remote_username }} + REMOTE_PASSWORD: ${{ secrets.remote_password }} + run: conan remote login "${REMOTE_NAME}" "${REMOTE_USERNAME}" --password "${REMOTE_PASSWORD}" - name: Upload Conan recipe (version) + env: + REMOTE_NAME: ${{ inputs.remote_name }} run: | conan export . --version=${{ steps.version.outputs.version }} conan upload --confirm --check --remote="${REMOTE_NAME}" xrpl/${{ steps.version.outputs.version }} @@ -71,6 +73,8 @@ jobs: # 'develop' branch, see on-trigger.yml. - name: Upload Conan recipe (develop) if: ${{ github.event_name == 'push' }} + env: + REMOTE_NAME: ${{ inputs.remote_name }} run: | conan export . --version=develop conan upload --confirm --check --remote="${REMOTE_NAME}" xrpl/develop @@ -79,6 +83,8 @@ jobs: # one of the 'release' branches, see on-pr.yml. - name: Upload Conan recipe (rc) if: ${{ github.event_name == 'pull_request' }} + env: + REMOTE_NAME: ${{ inputs.remote_name }} run: | conan export . --version=rc conan upload --confirm --check --remote="${REMOTE_NAME}" xrpl/rc @@ -87,6 +93,8 @@ jobs: # release, see on-tag.yml. - name: Upload Conan recipe (release) if: ${{ startsWith(github.ref, 'refs/tags/') }} + env: + REMOTE_NAME: ${{ inputs.remote_name }} run: | conan export . --version=release conan upload --confirm --check --remote="${REMOTE_NAME}" xrpl/release diff --git a/.github/workflows/upload-conan-deps.yml b/.github/workflows/upload-conan-deps.yml index 92b72cf6a9..5d3712cf9e 100644 --- a/.github/workflows/upload-conan-deps.yml +++ b/.github/workflows/upload-conan-deps.yml @@ -34,7 +34,7 @@ on: env: CONAN_REMOTE_NAME: xrplf - CONAN_REMOTE_URL: https://conan.xrplf.org/repository/conan/ + CONAN_REMOTE_URL: https://conan.ripplex.io NPROC_SUBTRACT: 2 concurrency: @@ -108,12 +108,10 @@ jobs: - name: Log into Conan remote if: ${{ github.repository == 'XRPLF/rippled' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') }} - run: conan remote login "${CONAN_REMOTE_NAME}" "${{ secrets.NEXUS_REMOTE_USERNAME }}" --password "${{ secrets.NEXUS_REMOTE_PASSWORD }}" + run: conan remote login "${CONAN_REMOTE_NAME}" "${{ secrets.CONAN_REMOTE_USERNAME }}" --password "${{ secrets.CONAN_REMOTE_PASSWORD }}" - name: Upload Conan packages if: ${{ github.repository == 'XRPLF/rippled' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') }} 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 "*" --remote="${CONAN_REMOTE_NAME}" --confirm ${FORCE_OPTION} diff --git a/BUILD.md b/BUILD.md index 847cd7bc1a..2ac24f2c5d 100644 --- a/BUILD.md +++ b/BUILD.md @@ -101,7 +101,7 @@ More information on customizing Conan can be found in the [Advanced Conan config Run the following command to add the `xrplf` remote, which hosts some of our dependencies: ```bash -conan remote add --index 0 --force xrplf https://conan.xrplf.org/repository/conan/ +conan remote add --index 0 --force xrplf https://conan.ripplex.io ``` ### Set Up Ccache diff --git a/conan.lock b/conan.lock index ae45a900b6..d80a6d0c57 100644 --- a/conan.lock +++ b/conan.lock @@ -1,43 +1,43 @@ { "version": "0.5", "requires": [ - "zlib/1.3.2#1cb806da49011867778ffb6ac7190fcb%1777558780.503", - "xxhash/0.8.3#681d36a0a6111fc56e5e45ea182c19cc%1743678659.187", - "sqlite3/3.53.0#324ada52333108388a9a6108bfa96734%1776096494.149", - "soci/4.0.3#e726491a03468795453f7c83fc924a96%1751554127.172", - "snappy/1.1.10#968fef506ff261592ec30c574d4a7809%1782307151.633168", - "secp256k1/0.7.1#b1f450b7f78a36fff75bb6934a356f3a%1782338841.3729", - "rocksdb/10.5.1#4a197eca381a3e5ae8adf8cffa5aacd0%1759820024.194", - "re2/20251105#8579cfd0bda4daf0683f9e3898f964b4%1772560729.95", - "protobuf/6.33.5#ff253ead763bd8d9904a52979cd21e81%1778763145.334", - "openssl/3.6.3#1163d4ddc603907084d08a6a0c6e580f%1782307150.583886", - "nudb/2.0.9#11149c73f8f2baff9a0198fe25971fc7%1774883011.384", - "lz4/1.10.0#982d9b673900f665a1da109e09c17cab%1775037240.923", - "libiconv/1.17#9923bc6dc6f106646d6967e0039a5ada%1774021608.288", - "libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1722218217.276", - "libarchive/3.8.7#c446109bd1f1d8ba7936c94189bc50e6%1776147552.838", + "zlib/1.3.2#1cb806da49011867778ffb6ac7190fcb%1778091116.056", + "xxhash/0.8.3#681d36a0a6111fc56e5e45ea182c19cc%1765850149.987", + "sqlite3/3.53.0#324ada52333108388a9a6108bfa96734%1778091117.311", + "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", + "protobuf/6.33.5#d96d52ba5baaaa532f47bda866ad87a5%1774467363.12", + "openssl/3.6.2#4789bbf131b77d0515d15e094c8f697f%1778071755.506", + "nudb/2.0.9#11149c73f8f2baff9a0198fe25971fc7%1775040983.408", + "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504%1765850143.914", + "libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1765842973.492", + "libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1765842973.03", + "libarchive/3.8.7#c446109bd1f1d8ba7936c94189bc50e6%1778091117.848", "jemalloc/5.3.1#1fc58d55316041f10fbc1e8a2eae632a%1776700028.228", - "gtest/1.17.0#5224b3b3ff3b4ce1133cbdd27d53ee7d%1755784855.585", - "grpc/1.81.1#5217e6ef0544c42b46f4af35d5e7f649%1782307148.845616", - "ed25519/2015.03#ae761bdc52730a843f0809bdf6c1b1f6%1782307148.15562", - "date/3.0.4#862e11e80030356b53c2c38599ceb32b%1754573467.979", - "c-ares/1.34.6#545240bb1c40e2cacd4362d6b8967650%1766500685.317", - "bzip2/1.0.8#c470882369c2d95c5c77e970c0c7e321%1762886692.465", - "boost/1.91.0#ea540ca2133d831b560036aa24dece3c%1778050991.9", - "abseil/20250127.0#bb0baf1f362bc4a725a24eddd419b8f7%1782307147.395833" + "gtest/1.17.0#5224b3b3ff3b4ce1133cbdd27d53ee7d%1768312129.152", + "grpc/1.81.0#2fb144aeb47e7f35c6ebb0e5f35bed31%1781620605.685", + "ed25519/2015.03#ae761bdc52730a843f0809bdf6c1b1f6%1765850143.772", + "date/3.0.4#862e11e80030356b53c2c38599ceb32b%1765850143.772", + "c-ares/1.34.6#545240bb1c40e2cacd4362d6b8967650%1774439234.681", + "bzip2/1.0.8#c470882369c2d95c5c77e970c0c7e321%1765850143.837", + "boost/1.91.0#ea540ca2133d831b560036aa24dece3c%1778091165.282", + "abseil/20250127.0#bb0baf1f362bc4a725a24eddd419b8f7%1774365460.196" ], "build_requires": [ - "zlib/1.3.2#1cb806da49011867778ffb6ac7190fcb%1777558780.503", - "strawberryperl/5.32.1.1#8d114504d172cfea8ea1662d09b6333e%1751971032.423", - "protobuf/6.33.5#ff253ead763bd8d9904a52979cd21e81%1778763145.334", - "nasm/2.16.01#31e26f2ee3c4346ecd347911bd126904%1745483323.489", + "zlib/1.3.2#1cb806da49011867778ffb6ac7190fcb%1778091116.056", + "strawberryperl/5.32.1.1#8d114504d172cfea8ea1662d09b6333e%1774447376.964", + "protobuf/6.33.5#d96d52ba5baaaa532f47bda866ad87a5%1774467363.12", + "nasm/2.16.01#31e26f2ee3c4346ecd347911bd126904%1765850144.707", "msys2/cci.latest#d22fe7b2808f5fd34d0a7923ace9c54f%1770657326.649", - "m4/1.4.19#34c4bbc3eeebe98ca6edf2f52d602e7d%1777282960.259", - "cmake/4.3.3#840cf00ea09777e05c2050a50a82c722%1781521538.233", - "b2/5.4.2#ffd6084a119587e70f11cd45d1a386e2%1766594659.866", + "m4/1.4.19#4523e4347b55cd26ae918bd5770cab9a%1778062762.471", + "cmake/4.3.0#b939a42e98f593fb34d3a8c5cc860359%1774439249.183", + "b2/5.4.2#ffd6084a119587e70f11cd45d1a386e2%1774439233.447", "automake/1.16.5#b91b7c384c3deaa9d535be02da14d04f%1755524470.56", "autoconf/2.71#51077f068e61700d65bb05541ea1e4b0%1731054366.86", - "abseil/20250127.0#bb0baf1f362bc4a725a24eddd419b8f7%1782307147.395833" + "abseil/20250127.0#bb0baf1f362bc4a725a24eddd419b8f7%1774365460.196" ], "python_requires": [], "overrides": { @@ -57,7 +57,7 @@ "boost/1.91.0" ], "lz4/[>=1.9.4 <2]": [ - "lz4/1.10.0#982d9b673900f665a1da109e09c17cab" + "lz4/1.10.0#59fc63cac7f10fbe8e05c7e62c2f3504" ] }, "config_requires": [] diff --git a/conan/lockfile/regenerate.sh b/conan/lockfile/regenerate.sh index 98ee6f7c99..1aa47628f0 100755 --- a/conan/lockfile/regenerate.sh +++ b/conan/lockfile/regenerate.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.xrplf.org/repository/conan/ +conan remote add --force --index 0 xrplf https://conan.ripplex.io # Delete any existing lockfile. rm -f conan.lock diff --git a/conanfile.py b/conanfile.py index 2733d4fc9c..5b78dc22e3 100644 --- a/conanfile.py +++ b/conanfile.py @@ -28,10 +28,10 @@ class Xrpl(ConanFile): requires = [ "ed25519/2015.03", - "grpc/1.81.1", + "grpc/1.81.0", "libarchive/3.8.7", "nudb/2.0.9", - "openssl/3.6.3", + "openssl/3.6.2", "secp256k1/0.7.1", "soci/4.0.3", "zlib/1.3.2", diff --git a/docs/build/advanced_conan.md b/docs/build/advanced_conan.md index 26b88ef186..aae17e385a 100644 --- a/docs/build/advanced_conan.md +++ b/docs/build/advanced_conan.md @@ -34,7 +34,7 @@ higher index than the default Conan Center remote, so it is consulted first. You can do this by running: ```bash -conan remote add --index 0 --force xrplf https://conan.xrplf.org/repository/conan/ +conan remote add --index 0 --force xrplf https://conan.ripplex.io ``` Alternatively, you can pull our recipes from the repository and export them locally: