From 780963d5db0702706ad5ec4e5d97743602b8ba53 Mon Sep 17 00:00:00 2001 From: Bart Thomee <11445373+bthomee@users.noreply.github.com> Date: Thu, 31 Jul 2025 16:38:47 -0400 Subject: [PATCH] Update Conan remote --- .github/actions/dependencies/action.yml | 22 ++++++++++------------ .github/workflows/macos.yml | 10 ---------- .github/workflows/windows.yml | 10 ---------- 3 files changed, 10 insertions(+), 32 deletions(-) diff --git a/.github/actions/dependencies/action.yml b/.github/actions/dependencies/action.yml index 8ac29646b6..b353664573 100644 --- a/.github/actions/dependencies/action.yml +++ b/.github/actions/dependencies/action.yml @@ -6,25 +6,23 @@ inputs: runs: using: composite steps: - - name: export custom recipes - shell: bash - - name: add Ripple Conan remote + - name: add Conan remote if: env.CONAN_URL != '' shell: bash run: | - if conan remote list | grep -q "ripple"; then - conan remote remove ripple - echo "Removed conan remote ripple" + if conan remote list | grep -q "xrplf"; then + conan remote remove xrplf + echo "Removed conan remote xrplf" fi - conan remote add --index 0 ripple "${CONAN_URL}" - echo "Added conan remote ripple at ${CONAN_URL}" - - name: try to authenticate to Ripple Conan remote - if: env.CONAN_LOGIN_USERNAME_RIPPLE != '' && env.CONAN_PASSWORD_RIPPLE != '' + conan remote add --index 0 xrplf "${CONAN_URL}" + echo "Added conan remote xrplf at ${CONAN_URL}" + - name: try to authenticate to Conan remote + if: env.CONAN_LOGIN_USERNAME_XRPLF != '' && env.CONAN_PASSWORD_XRPLF != '' id: remote shell: bash run: | - echo "Authenticating to ripple remote..." - conan remote auth ripple --force + echo "Authenticating to xrplf remote..." + conan remote auth xrplf --force conan remote list-users - name: list missing binaries id: binaries diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 0603930dda..5e986fd443 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -90,16 +90,6 @@ jobs: echo "${CONAN_GLOBAL_CONF}" >> $(conan config home)/global.conf conan config install conan/profiles/ -tf $(conan config home)/profiles/ conan profile show - - name: add Ripple Conan remote - if: env.CONAN_URL != '' - shell: bash - run: | - if conan remote list | grep -q "ripple"; then - conan remote remove ripple - echo "Removed conan remote ripple" - fi - conan remote add --index 0 ripple "${CONAN_URL}" - echo "Added conan remote ripple at ${CONAN_URL}" - name: build dependencies uses: ./.github/actions/dependencies with: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 67d7e221ae..885e7d3701 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -85,16 +85,6 @@ jobs: echo "${CONAN_GLOBAL_CONF}" >> $(conan config home)/global.conf conan config install conan/profiles/ -tf $(conan config home)/profiles/ conan profile show - - name: add Ripple Conan remote - if: env.CONAN_URL != '' - shell: bash - run: | - if conan remote list | grep -q "ripple"; then - conan remote remove ripple - echo "Removed conan remote ripple" - fi - conan remote add --index 0 ripple "${CONAN_URL}" - echo "Added conan remote ripple at ${CONAN_URL}" - name: build dependencies uses: ./.github/actions/dependencies with: