Skip to content

Commit f0b37fd

Browse files
committed
Restore json config files as version is needed too
1 parent 72b87b6 commit f0b37fd

File tree

4 files changed

+26
-8
lines changed

4 files changed

+26
-8
lines changed

.github/workflows/export.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ env:
2222
CONAN_REMOTE_NAME: xrplf
2323
CONAN_LOGIN_USERNAME_XRPLF: ${{ secrets.CONAN_USERNAME }}
2424
CONAN_PASSWORD_XRPLF: ${{ secrets.CONAN_PASSWORD }}
25-
CONAN_EXPORTS: >-
26-
protobuf/all
27-
snappy/all
28-
soci/all
2925

3026
jobs:
3127
build:
@@ -46,8 +42,15 @@ jobs:
4642
- name: Export the recipes
4743
working-directory: recipes
4844
run: |
49-
# Loop over all recipes to export.
50-
IFS=' ' read -ra EXPORTS <<< '${{ env.CONAN_EXPORTS }}'
51-
for EXPORT in "${EXPORTS[@]}"; do
52-
conan export "${EXPORT}" --remote ${{ env.CONAN_REMOTE_NAME }}
45+
# Loop over all recipes listed in the exports directory.
46+
for export in ../exports/*.json; do
47+
# Extract the recipe name, version, and directory.
48+
name=$(jq -r '.name' ${export})
49+
dir=$(jq -r '.dir' ${export})
50+
version=$(jq -r '.version' ${export})
51+
# Export the recipe.
52+
echo "Exporting recipe '${name}@${version}' from directory '${dir}'."
53+
conan export "${name}/${dir}" \
54+
--version="${version}" \
55+
--remote ${{ env.CONAN_REMOTE_NAME }}
5356
done

exports/protobuf-6.30.1.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"name": "protobuf",
3+
"dir": "all",
4+
"version": "6.30.1"
5+
}

exports/snappy-1.1.10.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"name": "snappy",
3+
"dir": "all",
4+
"version": "1.1.10"
5+
}

exports/soci-4.0.3.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"name": "soci",
3+
"dir": "all",
4+
"version": "4.0.3"
5+
}

0 commit comments

Comments
 (0)