File tree Expand file tree Collapse file tree 1 file changed +4
-6
lines changed
Expand file tree Collapse file tree 1 file changed +4
-6
lines changed Original file line number Diff line number Diff line change @@ -146,18 +146,16 @@ jobs:
146146 fi
147147
148148 # must run in the native platform shell: Qt doesn't build in bash on Windows
149- extraAndroidOptions='-o "qt/*:android_sdk=%s"'
150- extraAndroidOptionsBash=${{ startsWith(matrix.platform, 'android') && '$(printf $extraAndroidOptions "$ANDROID_HOME")' || '' }}
151- extraAndroidOptionsCmd=${{ startsWith(matrix.platform, 'android') && '$(printf $extraAndroidOptions "%ANDROID_HOME%")' || '' }}
149+ #extraAndroidOptionsBash=${{ startsWith(matrix.platform, 'android') && '-o "qt/*:android_sdk=$ANDROID_HOME"' || '' }}
152150 conanCreateCommand="conan create $packagePath \
153151 --version=$version \
154- \" --profile=../CI/conan/${{ matrix.conan_profile }}\" \
152+ --profile=../CI/conan/${{ matrix.conan_profile }} \
155153 --build=missing \
156154 --test-folder= \
157155 --core-conf core.sources.patch:extra_path=../deps/conan_patches \
158156 "
159- ${{ startsWith(matrix.platform, 'windows') && 'cmd /c " $conanCreateCommand $extraAndroidOptionsCmd "'
160- || '$conanCreateCommand $extraAndroidOptionsBash '
157+ ${{ startsWith(matrix.platform, 'windows') && 'cmd /C "\" $conanCreateCommand\" "'
158+ || '$conanCreateCommand ${{ startsWith(matrix.platform, 'android') && '-o "qt/*:android_sdk=$ANDROID_HOME"' || '' }} '
161159 }}
162160 done
163161
You can’t perform that action at this time.
0 commit comments