@@ -140,7 +140,7 @@ jobs:
140
140
141
141
# versions must be synced with: conan_patches/<package>/conandata.yml
142
142
# if no custom patches are required for a package, it should be removed from here
143
- for p in minizip/1.3.1 flac/1.4.2 qt/5.15.16 ; do
143
+ for p in minizip/1.3.1 flac/1.4.2 ; do
144
144
IFS_OLD="$IFS"
145
145
IFS=/
146
146
read package version <<<"$p"
@@ -163,11 +163,12 @@ jobs:
163
163
done
164
164
165
165
# TODO: remove LuaJIT when https://github.com/conan-io/conan-center-index/pull/26577 is merged
166
- - name : Build LuaJIT from PR changes
167
- if : ${{ !contains(matrix.conan_options, '"&:lua_lib=lua"') }}
166
+ # TODO: remove Qt5 when https://github.com/conan-io/conan-center-index/pull/28251 is merged
167
+ - name : Build LuaJIT & Qt5 from PR changes
168
168
run : |
169
169
cciForkRepo='cci-fork'
170
170
branchName='vcmi'
171
+ recipePathQt='recipes/qt'
171
172
172
173
git clone "https://github.com/kambala-decapitator/conan-center-index.git" "$cciForkRepo" \
173
174
--branch "$branchName" \
@@ -179,20 +180,30 @@ jobs:
179
180
cd "$cciForkRepo"
180
181
git sparse-checkout set \
181
182
recipes/luajit \
183
+ $recipePathQt \
182
184
183
185
git checkout
184
186
185
- for p in luajit/2.1.0-beta3 ; do
187
+ for p in ${{ contains(matrix.conan_options, '"&:lua_lib=lua"') && ' ' || ' luajit/2.1.0-beta3' }} qt/5.15.16 ; do
186
188
IFS_OLD="$IFS"
187
189
IFS=/
188
190
read package version <<<"$p"
189
191
IFS="$IFS_OLD"
190
192
191
- conan create "recipes/$package/all" \
193
+ if [[ $package == qt ]] ; then
194
+ packagePath="$recipePathQt/5.x.x"
195
+ else
196
+ packagePath="recipes/$package/all"
197
+ fi
198
+
199
+ # Windows workaround for https://bugreports.qt.io/browse/QTBUG-84543
200
+ PATH="$WINDOWS_PERL_DIR:$PATH" conan create "$packagePath" \
192
201
--version=$version \
193
202
$CONAN_PROFILES \
194
203
--build=missing \
195
- --test-folder=
204
+ --test-folder= \
205
+ --core-conf core.sources.patch:extra_path=$CUSTOM_PATCHES_PATH \
206
+ ${{ startsWith(matrix.platform, 'android') && '-o "qt/*:android_sdk=$ANDROID_HOME"' || '' }}
196
207
done
197
208
198
209
- name : Generate conan profile
0 commit comments