Skip to content

Commit 6d05062

Browse files
Update rebuildDependencies.yml
1 parent 86646ec commit 6d05062

File tree

1 file changed

+19
-14
lines changed

1 file changed

+19
-14
lines changed

.github/workflows/rebuildDependencies.yml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
include:
16-
- platform: mac-intel
17-
os: macos-14
18-
before_install: macos.sh
19-
conan_profile: macos-intel
20-
conan_system_libs: bzip2 libiconv sqlite3 zlib
16+
# - platform: mac-intel
17+
# os: macos-14
18+
# before_install: macos.sh
19+
# conan_profile: macos-intel
20+
# conan_system_libs: bzip2 libiconv sqlite3 zlib
2121
- platform: mac-arm
2222
os: macos-14
2323
before_install: macos.sh
@@ -28,11 +28,11 @@ jobs:
2828
# before_install: macos.sh
2929
# conan_profile: ios-arm64
3030
# conan_system_libs: bzip2 libiconv sqlite3 zlib
31-
- platform: android-armeabi-v7a
32-
os: ubuntu-24.04
33-
before_install: android.sh
34-
conan_profile: android-32-ndk
35-
conan_system_libs: zlib
31+
# - platform: android-armeabi-v7a
32+
# os: ubuntu-24.04
33+
# before_install: android.sh
34+
# conan_profile: android-32-ndk
35+
# conan_system_libs: zlib
3636
- platform: android-arm64-v8a
3737
os: ubuntu-24.04
3838
conan_profile: android-64-ndk
@@ -132,6 +132,7 @@ jobs:
132132
133133
# versions must be synced with: conan_patches/<package>/conandata.yml
134134
# if no custom patches are required for a package, it should be removed from here
135+
set -x
135136
for p in minizip/1.3.1 qt/5.15.16 ; do
136137
IFS_OLD="$IFS"
137138
IFS=/
@@ -144,13 +145,17 @@ jobs:
144145
packagePath="recipes/$package/all"
145146
fi
146147
147-
conan create "$packagePath" \
148-
--version="$version" \
148+
# must run in the native platform shell: Qt doesn't build in bash on Windows
149+
extraAndroidOptions="-o \"qt/*:android_sdk=$ANDROID_HOME\""
150+
conanCreateCommand="conan create $packagePath \
151+
--version=$version \
149152
--profile=../CI/conan/${{ matrix.conan_profile }} \
150153
--build=missing \
151154
--test-folder='' \
152-
--core-conf core.sources.patch:extra_path="$custom_patches_path" \
153-
${{ startsWith(matrix.platform, 'android') && '-o "qt/*:android_sdk=$ANDROID_HOME"' || '' }}
155+
--core-conf core.sources.patch:extra_path=$custom_patches_path \
156+
${{ startsWith(matrix.platform, 'android') && '$extraAndroidOptions' || '' }} \
157+
"
158+
${{ startsWith(matrix.platform, 'windows') && 'cmd /c "$conanCreateCommand"' || '$conanCreateCommand' }}
154159
done
155160
156161
# TODO: remove when https://github.com/conan-io/conan-center-index/pull/26577 is merged

0 commit comments

Comments
 (0)