Skip to content

Commit 397e8d5

Browse files
fix
1 parent 37676fe commit 397e8d5

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

.github/workflows/rebuildDependencies.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
154154
# versions must be synced with: conan_patches/<package>/conandata.yml
155155
# if no custom patches are required for a package, it should be removed from here
156-
for p in minizip/1.3.1 qt/5.15.16 ; do
156+
for p in minizip/1.3.1 flac/1.4.2 qt/5.15.16 ; do
157157
IFS_OLD="$IFS"
158158
IFS=/
159159
read package version <<<"$p"
@@ -220,7 +220,8 @@ jobs:
220220
ndkPackageRevision=$(conan list --format=compact "$ndkPackage/*:*" \
221221
| egrep --only-matching "$ndkPackage/\\w+#$hexRegex:$hexRegex")
222222
ndkPackagePath=$(conan cache path "$ndkPackageRevision")
223-
echo "NDK directory: $ndkPackagePath"
223+
ndkPath="$ndkPackagePath/bin"
224+
echo "NDK directory: $ndkPath"
224225
225226
- name: Remove build requirements' binaries
226227
shell: bash
@@ -245,7 +246,9 @@ jobs:
245246
shell: bash
246247
run: |
247248
packageList="$(conan list --format=compact | tail -n +2)"
248-
echo "CONAN_PACKAGES<<EOF\n$packageList\nEOF" >> $GITHUB_ENV
249+
echo "CONAN_PACKAGES<<EOF
250+
$packageList
251+
EOF" >> $GITHUB_ENV
249252
250253
- name: Create dependencies archive
251254
run: conan cache save --file dependencies-${{matrix.platform}}.tgz "*:*"

0 commit comments

Comments
 (0)