Skip to content

Commit 63cf3a9

Browse files
committed
Adjust Conan remote url and credentials
1 parent 1420f37 commit 63cf3a9

File tree

5 files changed

+5
-14
lines changed

5 files changed

+5
-14
lines changed

.github/actions/dependencies/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ runs:
1414
conan export --version 1.1.10 external/snappy
1515
conan export --version 4.0.3 external/soci
1616
- name: add Conan remotes
17-
if: env.CONAN_URL != ''
17+
if: vars.CONAN_REMOTE_URL != ''
1818
shell: bash
1919
run: |
2020
echo "Adding Conan remotes for recipes."
@@ -34,12 +34,12 @@ runs:
3434
echo "Added new conan remote '${{ inputs.remote_name }}' at ${CONAN_URL}/${{ inputs.remote_name }}."
3535
fi
3636
- name: Log into Conan remotes
37-
if: env.CONAN_URL != '' && env.CONAN_LOGIN_USERNAME_RIPPLE != '' && env.CONAN_PASSWORD_RIPPLE != ''
37+
if: vars.CONAN_REMOTE_URL != '' && secrets.CONAN_REMOTE_USERNAME != '' && secrets.CONAN_REMOTE_PASSWORD != ''
3838
id: remote
3939
shell: bash
4040
run: |
41-
conan remote login recipes "${{ env.CONAN_LOGIN_USERNAME_RIPPLE }}" --password "${{ env.CONAN_PASSWORD_RIPPLE }}"
42-
conan remote login ${{ inputs.conan_remote_name }} "${{ env.CONAN_LOGIN_USERNAME_RIPPLE }}" --password "${{ env.CONAN_PASSWORD_RIPPLE }}"
41+
conan remote login recipes "${{ secrets.CONAN_REMOTE_USERNAME }}" --password "${{ secrets.CONAN_REMOTE_PASSWORD }}"
42+
conan remote login ${{ inputs.conan_remote_name }} "${{ secrets.CONAN_REMOTE_USERNAME }}" --password "${{ secrets.CONAN_REMOTE_PASSWORD }}"
4343
conan remote list-users
4444
- name: list missing binaries
4545
id: binaries

.github/workflows/libxrpl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
conan remote list
5050
conan remote remove ripple || true
5151
# Do not quote the URL. An empty string will be accepted (with a non-fatal warning), but a missing argument will not.
52-
conan remote add ripple ${{ env.CONAN_URL }} --insert 0
52+
conan remote add ripple ${{ vars.CONAN_REMOTE_URL }} --insert 0
5353
- name: Parse new version
5454
id: version
5555
shell: bash

.github/workflows/macos.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ concurrency:
1818
# This part of Conan configuration is specific to this workflow only; we do not want
1919
# to pollute conan/profiles directory with settings which might not work for others
2020
env:
21-
CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/dev
22-
CONAN_LOGIN_USERNAME_RIPPLE: ${{ secrets.CONAN_USERNAME }}
23-
CONAN_PASSWORD_RIPPLE: ${{ secrets.CONAN_TOKEN }}
2421
CONAN_GLOBAL_CONF: |
2522
core.download:parallel={{os.cpu_count()}}
2623
core.upload:parallel={{os.cpu_count()}}

.github/workflows/nix.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ concurrency:
1919
# This part of Conan configuration is specific to this workflow only; we do not want
2020
# to pollute conan/profiles directory with settings which might not work for others
2121
env:
22-
CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/dev
23-
CONAN_LOGIN_USERNAME_RIPPLE: ${{ secrets.CONAN_USERNAME }}
24-
CONAN_PASSWORD_RIPPLE: ${{ secrets.CONAN_TOKEN }}
2522
CONAN_GLOBAL_CONF: |
2623
core.download:parallel={{ os.cpu_count() }}
2724
core.upload:parallel={{ os.cpu_count() }}

.github/workflows/windows.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ concurrency:
2121
# This part of Conan configuration is specific to this workflow only; we do not want
2222
# to pollute conan/profiles directory with settings which might not work for others
2323
env:
24-
CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/dev
25-
CONAN_LOGIN_USERNAME_RIPPLE: ${{ secrets.CONAN_USERNAME }}
26-
CONAN_PASSWORD_RIPPLE: ${{ secrets.CONAN_TOKEN }}
2724
CONAN_GLOBAL_CONF: |
2825
core.download:parallel={{os.cpu_count()}}
2926
core.upload:parallel={{os.cpu_count()}}

0 commit comments

Comments
 (0)