Skip to content

Commit 5cf1ef5

Browse files
1
1 parent c120b61 commit 5cf1ef5

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

.github/workflows/rebuildDependencies.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ jobs:
9393
set -x
9494
cciRepo='conan-center-index'
9595
branchName='master'
96-
recipePathMinizip='recipes/minizip/all'
97-
recipePathQt='recipes/qt/5.x.x'
96+
recipePathMinizip='recipes/minizip'
97+
recipePathQt='recipes/qt'
9898
custom_patches_path="$(pwd)/deps/conan_patches"
9999
100100
git clone "https://github.com/conan-io/$cciRepo.git" \
@@ -105,18 +105,19 @@ jobs:
105105
--single-branch
106106
cd "$cciRepo"
107107
git sparse-checkout init
108-
git sparse-checkout set --cone "$recipePathMinizip" "$recipePathQt"
108+
git sparse-checkout set "$recipePathMinizip" "$recipePathQt"
109109
git switch "$branchName"
110110
111111
# versions must be synced with: conan_patches/<package>/conandata.yml
112112
# if no custom patches are required for a package, it should be removed from here
113113
for p in minizip/1.3.1 qt/5.15.16 ; do
114114
IFS_OLD="$IFS"
115+
IFS=/
115116
read package version <<<"$p"
116117
IFS="IFS_OLD"
117118
118119
if [[ $package == qt ]] ; then
119-
packagePath="$recipePathQt"
120+
packagePath="$recipePathQt/5.x.x"
120121
else
121122
packagePath="recipes/$package/all"
122123
fi
@@ -135,7 +136,7 @@ jobs:
135136
run: |
136137
cciForkRepo='cci-fork'
137138
branchName='package/luajit'
138-
recipePath='recipes/luajit/all'
139+
recipePath='recipes/luajit'
139140
140141
git clone "https://github.com/kambala-decapitator/conan-center-index.git" "$cciForkRepo" \
141142
--branch "$branchName" \
@@ -148,7 +149,7 @@ jobs:
148149
git sparse-checkout set "$recipePath"
149150
git switch "$branchName"
150151
151-
conan create "$recipePath" \
152+
conan create "$recipePath/all" \
152153
--version=2.1.0-beta3 \
153154
--profile=CI/conan/${{ matrix.conan_profile }} \
154155
--build=missing \

0 commit comments

Comments
 (0)