File tree Expand file tree Collapse file tree 1 file changed +4
-2
lines changed
Expand file tree Collapse file tree 1 file changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -119,7 +119,9 @@ jobs:
119119
120120 cwdNative=$(python3 -c 'import os; print(os.getcwd())')
121121 custom_patches_path="$cwdNative/deps/conan_patches"
122- extraAndroidOptionsBash="${{ startsWith(matrix.platform, 'android') && '-o ''qt/*:android_sdk=$ANDROID_HOME'' ' || '' }}"
122+
123+ extraAndroidOptions="-o qt/*:android_sdk=$ANDROID_HOME"
124+ extraOptionsBash=${{ startsWith(matrix.platform, 'android') && '"$extraAndroidOptions"' || '' }}
123125
124126 function slash2backslash {
125127 slash=/
@@ -159,7 +161,7 @@ jobs:
159161 --test-folder= \
160162 --core-conf core.sources.patch:extra_path=$custom_patches_path \
161163 "
162- ${{ startsWith(matrix.platform, 'windows') && 'cmd /C $(slash2backslash "$conanCreateCommand")'
164+ ${{ startsWith(matrix.platform, 'windows') && 'cmd /C " $(slash2backslash "$conanCreateCommand")" '
163165 || '$conanCreateCommand $extraAndroidOptionsBash'
164166 }}
165167 done
You can’t perform that action at this time.
0 commit comments