|
68 | 68 | pipx install conan |
69 | 69 | conan profile detect |
70 | 70 |
|
| 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 | + |
71 | 87 | - name: Install system libs recipes |
72 | 88 | if: ${{ matrix.conan_system_libs }} |
73 | 89 | shell: bash |
@@ -109,24 +125,28 @@ jobs: |
109 | 125 |
|
110 | 126 | # versions must be synced with: conan_patches/<package>/conandata.yml |
111 | 127 | # 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 |
113 | 130 | IFS_OLD="$IFS" |
114 | 131 | IFS=/ |
115 | 132 | read package version <<<"$p" |
116 | 133 | IFS="$IFS_OLD" |
117 | 134 |
|
118 | 135 | if [[ $package == qt ]] ; then |
119 | 136 | packagePath="$recipePathQt/5.x.x" |
| 137 | + # extraOptions=${{ startsWith(matrix.platform, 'android') && "-o qt/*:android_sdk=$ANDROID_HOME" }} |
120 | 138 | else |
121 | 139 | packagePath="recipes/$package/all" |
| 140 | + # extraOptions= |
122 | 141 | fi |
123 | 142 |
|
124 | 143 | conan create "$packagePath" \ |
125 | 144 | --version="$version" \ |
126 | 145 | --profile=../CI/conan/${{ matrix.conan_profile }} \ |
127 | 146 | --build=missing \ |
128 | 147 | --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"' }} |
130 | 150 | done |
131 | 151 |
|
132 | 152 | # TODO: remove when https://github.com/conan-io/conan-center-index/pull/26577 is merged |
|
0 commit comments