@@ -18,11 +18,11 @@ jobs:
1818 # before_install: macos.sh
1919 # conan_profile: macos-intel
2020 # conan_system_libs: bzip2 libiconv sqlite3 zlib
21- - platform : mac-arm
22- os : macos-14
23- before_install : macos.sh
24- conan_profile : macos-arm
25- conan_system_libs : bzip2 libiconv sqlite3 zlib
21+ # - platform: mac-arm
22+ # os: macos-14
23+ # before_install: macos.sh
24+ # conan_profile: macos-arm
25+ # conan_system_libs: bzip2 libiconv sqlite3 zlib
2626 # - platform: ios
2727 # os: macos-14
2828 # before_install: macos.sh
@@ -33,10 +33,10 @@ jobs:
3333 # before_install: android.sh
3434 # conan_profile: android-32-ndk
3535 # conan_system_libs: zlib
36- - platform : android-arm64-v8a
37- os : ubuntu-24.04
38- conan_profile : android-64-ndk
39- conan_system_libs : zlib
36+ # - platform: android-arm64-v8a
37+ # os: ubuntu-24.04
38+ # conan_profile: android-64-ndk
39+ # conan_system_libs: zlib
4040 - platform : windows-x64
4141 os : windows-2022
4242 # before_install: msvc.sh
@@ -120,8 +120,8 @@ jobs:
120120 cwdNative=$(python3 -c 'import os; print(os.getcwd())')
121121 custom_patches_path="$cwdNative/deps/conan_patches"
122122
123- extraAndroidOptions="-o qt/*:android_sdk=$ANDROID_HOME"
124- extraOptionsBash=${{ startsWith(matrix.platform, 'android') && '"$extraAndroidOptions "' || '' }}
123+ # extraAndroidOptions="-o qt/*:android_sdk=$ANDROID_HOME"
124+ extraOptionsBash=${{ startsWith(matrix.platform, 'android') && '"-o qt/*:android_sdk=$ANDROID_HOME "' || '' }}
125125
126126 function slash2backslash {
127127 slash=/
@@ -161,7 +161,7 @@ jobs:
161161 --test-folder= \
162162 --core-conf core.sources.patch:extra_path=$custom_patches_path \
163163 "
164- ${{ startsWith(matrix.platform, 'windows') && 'cmd /K " $(slash2backslash "$conanCreateCommand")"'
164+ ${{ startsWith(matrix.platform, 'windows') && 'cmd /C "\" $(slash2backslash "$conanCreateCommand")\" "'
165165 || '$conanCreateCommand $extraOptionsBash'
166166 }}
167167 done
0 commit comments