Skip to content

Commit 2c62188

Browse files
1
1 parent a047352 commit 2c62188

File tree

1 file changed

+22
-2
lines changed

1 file changed

+22
-2
lines changed

.github/workflows/rebuildDependencies.yml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,22 @@ jobs:
6868
pipx install conan
6969
conan profile detect
7070
71+
# CMake/Ninja version should be synced with runners
72+
# https://github.com/actions/runner-images/tree/main/images
73+
# using CMake from Android SDK because some runners already have CMake v4
74+
- name: Prepare platform tools
75+
shell: bash
76+
run: |
77+
cmakeVersion=3.31.5
78+
echo "$ANDROID_HOME/cmake/$cmakeVersion" >> "$GITHUB_PATH"
79+
echo "
80+
[platform_tool_requires]
81+
cmake/$cmakeVersion
82+
ninja/1.12.1
83+
84+
[conf]
85+
tools.cmake.cmaketoolchain:generator=Ninja" >> $(conan profile path default)
86+
7187
- name: Install system libs recipes
7288
if: ${{ matrix.conan_system_libs }}
7389
shell: bash
@@ -109,24 +125,28 @@ jobs:
109125
110126
# versions must be synced with: conan_patches/<package>/conandata.yml
111127
# if no custom patches are required for a package, it should be removed from here
112-
for p in minizip/1.3.1 qt/5.15.16 ; do
128+
# md4c is here because it's overridden in our conanfile.py and is required by Qt
129+
for p in minizip/1.3.1 md4c/0.5.2 qt/5.15.16 ; do
113130
IFS_OLD="$IFS"
114131
IFS=/
115132
read package version <<<"$p"
116133
IFS="$IFS_OLD"
117134
118135
if [[ $package == qt ]] ; then
119136
packagePath="$recipePathQt/5.x.x"
137+
# extraOptions=${{ startsWith(matrix.platform, 'android') && "-o qt/*:android_sdk=$ANDROID_HOME" }}
120138
else
121139
packagePath="recipes/$package/all"
140+
# extraOptions=
122141
fi
123142
124143
conan create "$packagePath" \
125144
--version="$version" \
126145
--profile=../CI/conan/${{ matrix.conan_profile }} \
127146
--build=missing \
128147
--test-folder='' \
129-
--core-conf core.sources.patch:extra_path="$custom_patches_path"
148+
--core-conf core.sources.patch:extra_path="$custom_patches_path" \
149+
${{ startsWith(matrix.platform, 'android') && '-o "qt/*:android_sdk=$ANDROID_HOME"' }}
130150
done
131151
132152
# TODO: remove when https://github.com/conan-io/conan-center-index/pull/26577 is merged

0 commit comments

Comments
 (0)