Skip to content

Commit 3276fa2

Browse files
Update rebuildDependencies.yml
1 parent d88723a commit 3276fa2

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

.github/workflows/rebuildDependencies.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ jobs:
7979
newPathFile=$(mktemp)
8080
echo "$ANDROID_HOME/cmake/$cmakeVersion/bin" | cat - "$GITHUB_PATH" > "$newPathFile"
8181
mv -f "$newPathFile" "$GITHUB_PATH"
82-
cat "$GITHUB_PATH"
8382
8483
echo "
8584
[platform_tool_requires]
@@ -111,7 +110,6 @@ jobs:
111110
- name: Build recipes with our patches
112111
shell: bash
113112
run: |
114-
cmake --version
115113
cciRepo='conan-center-index'
116114
branchName='master'
117115
recipePathMd4c='recipes/md4c'
@@ -146,7 +144,7 @@ jobs:
146144
fi
147145
148146
# must run in the native platform shell: Qt doesn't build in bash on Windows
149-
#extraAndroidOptionsBash=${{ startsWith(matrix.platform, 'android') && '-o "qt/*:android_sdk=$ANDROID_HOME"' || '' }}
147+
extraAndroidOptionsBash="${{ startsWith(matrix.platform, 'android') && '-o ''qt/*:android_sdk=$ANDROID_HOME''' || '' }}"
150148
conanCreateCommand="conan create $packagePath \
151149
--version=$version \
152150
--profile=../CI/conan/${{ matrix.conan_profile }} \
@@ -155,7 +153,7 @@ jobs:
155153
--core-conf core.sources.patch:extra_path=../deps/conan_patches \
156154
"
157155
${{ startsWith(matrix.platform, 'windows') && 'cmd /C "\"$conanCreateCommand\""'
158-
|| '$conanCreateCommand ${{ startsWith(matrix.platform, 'android') && '-o "qt/*:android_sdk=$ANDROID_HOME"' || '' }}'
156+
|| '$conanCreateCommand $extraAndroidOptionsBash'
159157
}}
160158
done
161159

0 commit comments

Comments
 (0)