From 2dd769ab16b0153862ec85cb926cb9e1da885e8c Mon Sep 17 00:00:00 2001 From: Ruben Manukyan Date: Wed, 11 Dec 2024 15:40:02 -0800 Subject: [PATCH 1/4] removing ripple remote --- .github/actions/dependencies/action.yml | 46 ++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/actions/dependencies/action.yml b/.github/actions/dependencies/action.yml index 50e2999018a..992070e5432 100644 --- a/.github/actions/dependencies/action.yml +++ b/.github/actions/dependencies/action.yml @@ -16,25 +16,25 @@ runs: conan export external/snappy snappy/1.1.10@ conan export external/rocksdb rocksdb/6.29.5@ conan export external/soci soci/4.0.3@ - - name: add Ripple Conan remote - shell: bash - run: | - conan remote list - conan remote remove ripple || true - # Do not quote the URL. An empty string will be accepted (with - # a non-fatal warning), but a missing argument will not. - conan remote add ripple ${{ env.CONAN_URL }} --insert 0 - - name: try to authenticate to Ripple Conan remote - id: remote - shell: bash - run: | - # `conan user` implicitly uses the environment variables - # CONAN_LOGIN_USERNAME_ and CONAN_PASSWORD_. - # https://docs.conan.io/1/reference/commands/misc/user.html#using-environment-variables - # https://docs.conan.io/1/reference/env_vars.html#conan-login-username-conan-login-username-remote-name - # https://docs.conan.io/1/reference/env_vars.html#conan-password-conan-password-remote-name - echo outcome=$(conan user --remote ripple --password >&2 \ - && echo success || echo failure) | tee ${GITHUB_OUTPUT} + # - name: add Ripple Conan remote + # shell: bash + # run: | + # conan remote list + # conan remote remove ripple || true + # # Do not quote the URL. An empty string will be accepted (with + # # a non-fatal warning), but a missing argument will not. + # conan remote add ripple ${{ env.CONAN_URL }} --insert 0 + # - name: try to authenticate to Ripple Conan remote + # id: remote + # shell: bash + # run: | + # # `conan user` implicitly uses the environment variables + # # CONAN_LOGIN_USERNAME_ and CONAN_PASSWORD_. + # # https://docs.conan.io/1/reference/commands/misc/user.html#using-environment-variables + # # https://docs.conan.io/1/reference/env_vars.html#conan-login-username-conan-login-username-remote-name + # # https://docs.conan.io/1/reference/env_vars.html#conan-password-conan-password-remote-name + # echo outcome=$(conan user --remote ripple --password >&2 \ + # && echo success || echo failure) | tee ${GITHUB_OUTPUT} - name: list missing binaries id: binaries shell: bash @@ -54,7 +54,7 @@ runs: --options xrpld=True \ --settings build_type=${{ inputs.configuration }} \ .. - - name: upload dependencies to remote - if: (steps.binaries.outputs.missing != '[]') && (steps.remote.outputs.outcome == 'success') - shell: bash - run: conan upload --remote ripple '*' --all --parallel --confirm + # - name: upload dependencies to remote + # if: (steps.binaries.outputs.missing != '[]') && (steps.remote.outputs.outcome == 'success') + # shell: bash + # run: conan upload --remote ripple '*' --all --parallel --confirm From 288ac4f572ffc363d7e7b9d9963a577e2623266c Mon Sep 17 00:00:00 2001 From: Ruben Manukyan Date: Thu, 2 Jan 2025 15:09:17 -0500 Subject: [PATCH 2/4] changed macos runner tag to 15 --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ab4be74fbf4..3ce74e21efa 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -26,7 +26,7 @@ jobs: - Ninja configuration: - Release - runs-on: [self-hosted, macOS] + runs-on: [self-hosted, macos15] env: # The `build` action requires these variables. build_dir: .build From 7cba2dfe678eb710f7647f6ed240b574ac1bdb28 Mon Sep 17 00:00:00 2001 From: Ruben Manukyan Date: Thu, 2 Jan 2025 17:05:24 -0500 Subject: [PATCH 3/4] added python installation --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 3ce74e21efa..30b3514410f 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -45,7 +45,7 @@ jobs: run: | env | sort echo ${PATH} | tr ':' '\n' - python --version + python --version || brew install python && ln -s /opt/homebrew/bin/python3 /opt/homebrew/bin/python conan --version cmake --version - name: configure Conan From 70cfe024a7e5d786273840545943a3ff6ee8b6ea Mon Sep 17 00:00:00 2001 From: Ruben Manukyan Date: Thu, 2 Jan 2025 17:07:02 -0500 Subject: [PATCH 4/4] Revert "removing ripple remote" This reverts commit 2dd769ab16b0153862ec85cb926cb9e1da885e8c. --- .github/actions/dependencies/action.yml | 46 ++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/actions/dependencies/action.yml b/.github/actions/dependencies/action.yml index 992070e5432..50e2999018a 100644 --- a/.github/actions/dependencies/action.yml +++ b/.github/actions/dependencies/action.yml @@ -16,25 +16,25 @@ runs: conan export external/snappy snappy/1.1.10@ conan export external/rocksdb rocksdb/6.29.5@ conan export external/soci soci/4.0.3@ - # - name: add Ripple Conan remote - # shell: bash - # run: | - # conan remote list - # conan remote remove ripple || true - # # Do not quote the URL. An empty string will be accepted (with - # # a non-fatal warning), but a missing argument will not. - # conan remote add ripple ${{ env.CONAN_URL }} --insert 0 - # - name: try to authenticate to Ripple Conan remote - # id: remote - # shell: bash - # run: | - # # `conan user` implicitly uses the environment variables - # # CONAN_LOGIN_USERNAME_ and CONAN_PASSWORD_. - # # https://docs.conan.io/1/reference/commands/misc/user.html#using-environment-variables - # # https://docs.conan.io/1/reference/env_vars.html#conan-login-username-conan-login-username-remote-name - # # https://docs.conan.io/1/reference/env_vars.html#conan-password-conan-password-remote-name - # echo outcome=$(conan user --remote ripple --password >&2 \ - # && echo success || echo failure) | tee ${GITHUB_OUTPUT} + - name: add Ripple Conan remote + shell: bash + run: | + conan remote list + conan remote remove ripple || true + # Do not quote the URL. An empty string will be accepted (with + # a non-fatal warning), but a missing argument will not. + conan remote add ripple ${{ env.CONAN_URL }} --insert 0 + - name: try to authenticate to Ripple Conan remote + id: remote + shell: bash + run: | + # `conan user` implicitly uses the environment variables + # CONAN_LOGIN_USERNAME_ and CONAN_PASSWORD_. + # https://docs.conan.io/1/reference/commands/misc/user.html#using-environment-variables + # https://docs.conan.io/1/reference/env_vars.html#conan-login-username-conan-login-username-remote-name + # https://docs.conan.io/1/reference/env_vars.html#conan-password-conan-password-remote-name + echo outcome=$(conan user --remote ripple --password >&2 \ + && echo success || echo failure) | tee ${GITHUB_OUTPUT} - name: list missing binaries id: binaries shell: bash @@ -54,7 +54,7 @@ runs: --options xrpld=True \ --settings build_type=${{ inputs.configuration }} \ .. - # - name: upload dependencies to remote - # if: (steps.binaries.outputs.missing != '[]') && (steps.remote.outputs.outcome == 'success') - # shell: bash - # run: conan upload --remote ripple '*' --all --parallel --confirm + - name: upload dependencies to remote + if: (steps.binaries.outputs.missing != '[]') && (steps.remote.outputs.outcome == 'success') + shell: bash + run: conan upload --remote ripple '*' --all --parallel --confirm