Skip to content

Commit 5cc3777

Browse files
thejohnfreemanthejohnfreeman
authored
Fix workflows (XRPLF#4948)
The problem was `CONAN_USERNAME` environment variable, which Conan 1.x uses as the default user in package references.
1 parent ad8e976 commit 5cc3777

4 files changed

Lines changed: 35 additions & 28 deletions

File tree

‎.github/actions/dependencies/action.yml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,25 @@ runs:
1616
conan export external/snappy snappy/1.1.10@
1717
conan export external/rocksdb rocksdb/6.29.5@
1818
conan export external/soci soci/4.0.3@
19-
- name: try to authenticate to ripple Conan remote
20-
id: remote
19+
- name: add Ripple Conan remote
2120
shell: bash
2221
run: |
22+
conan remote list
23+
conan remote remove ripple || true
2324
# Do not quote the URL. An empty string will be accepted (with
2425
# a non-fatal warning), but a missing argument will not.
2526
conan remote add ripple ${{ env.CONAN_URL }} --insert 0
26-
echo outcome=$(conan user --remote ripple ${{ env.CONAN_USERNAME }} \
27-
--password ${{ env.CONAN_TOKEN }} >&2 && echo success || \
28-
echo failure) | tee ${GITHUB_OUTPUT}
27+
- name: try to authenticate to Ripple Conan remote
28+
id: remote
29+
shell: bash
30+
run: |
31+
# `conan user` implicitly uses the environment variables
32+
# CONAN_LOGIN_USERNAME_<REMOTE> and CONAN_PASSWORD_<REMOTE>.
33+
# https://docs.conan.io/1/reference/commands/misc/user.html#using-environment-variables
34+
# https://docs.conan.io/1/reference/env_vars.html#conan-login-username-conan-login-username-remote-name
35+
# https://docs.conan.io/1/reference/env_vars.html#conan-password-conan-password-remote-name
36+
echo outcome=$(conan user --remote ripple --password >&2 \
37+
&& echo success || echo failure) | tee ${GITHUB_OUTPUT}
2938
- name: list missing binaries
3039
id: binaries
3140
shell: bash

‎.github/workflows/macos.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,27 @@ jobs:
2222
NUM_PROCESSORS: 12
2323
steps:
2424
- name: checkout
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626
- name: install Ninja
2727
if: matrix.generator == 'Ninja'
2828
run: brew install ninja
2929
- name: check environment
3030
run: |
31+
env | sort
3132
echo ${PATH} | tr ':' '\n'
3233
python --version
3334
conan --version
3435
cmake --version
35-
env | sort
3636
- name: configure Conan
3737
run : |
3838
conan profile get env.CXXFLAGS default || true
3939
conan profile update 'conf.tools.build:cxxflags+=["-DBOOST_ASIO_DISABLE_CONCEPTS"]' default
40-
conan remote remove ripple
4140
- name: build dependencies
4241
uses: ./.github/actions/dependencies
4342
env:
4443
CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/conan-non-prod
45-
CONAN_USERNAME: ${{ secrets.CONAN_USERNAME }}
46-
CONAN_TOKEN: ${{ secrets.CONAN_TOKEN }}
44+
CONAN_LOGIN_USERNAME_RIPPLE: ${{ secrets.CONAN_USERNAME }}
45+
CONAN_PASSWORD_RIPPLE: ${{ secrets.CONAN_TOKEN }}
4746
with:
4847
configuration: ${{ matrix.configuration }}
4948
- name: build

‎.github/workflows/nix.yml‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
build_dir: .build
5555
steps:
5656
- name: checkout
57-
uses: actions/checkout@v3
57+
uses: actions/checkout@v4
5858
- name: check environment
5959
run: |
6060
echo ${PATH} | tr ':' '\n'
@@ -78,12 +78,12 @@ jobs:
7878
uses: ./.github/actions/dependencies
7979
env:
8080
CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/conan-non-prod
81-
CONAN_USERNAME: ${{ secrets.CONAN_USERNAME }}
82-
CONAN_TOKEN: ${{ secrets.CONAN_TOKEN }}
81+
CONAN_LOGIN_USERNAME_RIPPLE: ${{ secrets.CONAN_USERNAME }}
82+
CONAN_PASSWORD_RIPPLE: ${{ secrets.CONAN_TOKEN }}
8383
with:
8484
configuration: ${{ matrix.configuration }}
8585
- name: upload archive
86-
uses: actions/upload-artifact@v3
86+
uses: actions/upload-artifact@v4
8787
with:
8888
name: ${{ matrix.platform }}-${{ matrix.compiler }}-${{ matrix.configuration }}
8989
path: conan.tar
@@ -112,7 +112,7 @@ jobs:
112112
build_dir: .build
113113
steps:
114114
- name: download cache
115-
uses: actions/download-artifact@v3
115+
uses: actions/download-artifact@v4
116116
with:
117117
name: ${{ matrix.platform }}-${{ matrix.compiler }}-${{ matrix.configuration }}
118118
- name: extract cache
@@ -121,13 +121,12 @@ jobs:
121121
tar -xzf conan.tar -C ~/.conan
122122
- name: check environment
123123
run: |
124+
env | sort
124125
echo ${PATH} | tr ':' '\n'
125126
conan --version
126127
cmake --version
127-
env | sort
128-
ls ~/.conan
129128
- name: checkout
130-
uses: actions/checkout@v3
129+
uses: actions/checkout@v4
131130
- name: dependencies
132131
uses: ./.github/actions/dependencies
133132
env:
@@ -162,7 +161,7 @@ jobs:
162161
build_dir: .build
163162
steps:
164163
- name: download cache
165-
uses: actions/download-artifact@v3
164+
uses: actions/download-artifact@v4
166165
with:
167166
name: ${{ matrix.platform }}-${{ matrix.compiler }}-${{ matrix.configuration }}
168167
- name: extract cache
@@ -178,7 +177,7 @@ jobs:
178177
env | sort
179178
ls ~/.conan
180179
- name: checkout
181-
uses: actions/checkout@v3
180+
uses: actions/checkout@v4
182181
- name: dependencies
183182
uses: ./.github/actions/dependencies
184183
env:
@@ -202,15 +201,15 @@ jobs:
202201
run: |
203202
mv "${build_dir}/coverage.xml" ./
204203
- name: archive coverage report
205-
uses: actions/upload-artifact@v3
204+
uses: actions/upload-artifact@v4
206205
with:
207206
name: coverage.xml
208207
path: coverage.xml
209208
retention-days: 30
210209
- name: upload coverage report
211210
uses: wandalen/[email protected]
212211
with:
213-
action: codecov/codecov-action@v3
212+
action: codecov/codecov-action@v4
214213
with: |
215214
files: coverage.xml
216215
fail_ci_if_error: true

‎.github/workflows/windows.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
build_dir: .build
2828
steps:
2929
- name: checkout
30-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
3131
- name: choose Python
32-
uses: actions/setup-python@v3
32+
uses: actions/setup-python@v5
3333
with:
3434
python-version: 3.9
3535
- name: learn Python cache directory
@@ -39,19 +39,19 @@ jobs:
3939
python -m pip install --upgrade pip
4040
echo "dir=$(pip cache dir)" | tee ${GITHUB_OUTPUT}
4141
- name: restore Python cache directory
42-
uses: actions/cache@v3
42+
uses: actions/cache@v4
4343
with:
4444
path: ${{ steps.pip-cache.outputs.dir }}
4545
key: ${{ runner.os }}-${{ hashFiles('.github/workflows/windows.yml') }}
4646
- name: install Conan
4747
run: pip install wheel 'conan<2'
4848
- name: check environment
4949
run: |
50+
dir env:
5051
$env:PATH -split ';'
5152
python --version
5253
conan --version
5354
cmake --version
54-
dir env:
5555
- name: configure Conan
5656
shell: bash
5757
run: |
@@ -61,8 +61,8 @@ jobs:
6161
uses: ./.github/actions/dependencies
6262
env:
6363
CONAN_URL: http://18.143.149.228:8081/artifactory/api/conan/conan-non-prod
64-
CONAN_USERNAME: ${{ secrets.CONAN_USERNAME }}
65-
CONAN_TOKEN: ${{ secrets.CONAN_TOKEN }}
64+
CONAN_LOGIN_USERNAME_RIPPLE: ${{ secrets.CONAN_USERNAME }}
65+
CONAN_PASSWORD_RIPPLE: ${{ secrets.CONAN_TOKEN }}
6666
with:
6767
configuration: ${{ matrix.configuration }}
6868
- name: build

0 commit comments

Comments
 (0)