Skip to content

Commit 3a8e6ac

Browse files
Update rebuildDependencies.yml
1 parent c6ceb29 commit 3a8e6ac

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

.github/workflows/rebuildDependencies.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff 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

0 commit comments

Comments
 (0)