Skip to content

Commit 5c8dd68

Browse files
build Qt5 from fork
needs conan-io/conan-center-index#28251
1 parent 9c0ce5c commit 5c8dd68

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed

.github/workflows/rebuildDependencies.yml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
141141
# versions must be synced with: conan_patches/<package>/conandata.yml
142142
# 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
144144
IFS_OLD="$IFS"
145145
IFS=/
146146
read package version <<<"$p"
@@ -163,11 +163,12 @@ jobs:
163163
done
164164
165165
# 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
168168
run: |
169169
cciForkRepo='cci-fork'
170170
branchName='vcmi'
171+
recipePathQt='recipes/qt'
171172
172173
git clone "https://github.com/kambala-decapitator/conan-center-index.git" "$cciForkRepo" \
173174
--branch "$branchName" \
@@ -179,20 +180,30 @@ jobs:
179180
cd "$cciForkRepo"
180181
git sparse-checkout set \
181182
recipes/luajit \
183+
$recipePathQt \
182184
183185
git checkout
184186
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
186188
IFS_OLD="$IFS"
187189
IFS=/
188190
read package version <<<"$p"
189191
IFS="$IFS_OLD"
190192
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" \
192201
--version=$version \
193202
$CONAN_PROFILES \
194203
--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"' || '' }}
196207
done
197208
198209
- name: Generate conan profile

0 commit comments

Comments
 (0)