Skip to content

Commit c32d46c

Browse files
committed
Update ci-alpine-release.yml
1 parent dd0a555 commit c32d46c

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

.github/workflows/ci-alpine-release.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,20 @@ jobs:
5656
env:
5757
lt_version: ${{ matrix.qbt_libtorrent_version }}
5858
run: |
59-
revision="$(jq -r .revision ${lt_version}/*-dependency-version.json | sort -nr | head -n1)"
60-
boost="$(jq -r .boost ${lt_version}/*-dependency-version.json | head -n1)"
59+
revision="$(jq -r .revision "${lt_version}"/*-dependency-version.json | sort -nr | head -n1)"
60+
boost="$(jq -r .boost "${lt_version}"/*-dependency-version.json | head -n1)"
6161
62-
for dependency_version_json in ${lt_version}/*-dependency-version.json; do
62+
# this need to check both 1.2 and 2.0 folders to merge the libtorrent versions in the dependency-version.json
63+
for dependency_version_json in {1.2,2.0}/*-dependency-version.json; do
6364
if [[ -f ${dependency_version_json} ]]; then
6465
sed -r 's/"boost": (.*)/BOOST_PLACEHOLDER/g' -i "${dependency_version_json}"
6566
sed -r 's/"revision": (.*)/REVISION_PLACEHOLDER/g' -i "${dependency_version_json}"
6667
dependency_version+=("${dependency_version_json}")
6768
fi
6869
done
6970
70-
for release_md in ${lt_version}/*-release.md; do
71+
# This file only needs to merge info specific to the libtorrent matrix running it.
72+
for release_md in "${lt_version}"/*-release.md; do
7173
if [[ -f ${release_md} ]]; then
7274
sed -r 's/^\|(.*)revision(.*)\|(.*)\|$/REVISION_PLACEHOLDER/g' -i "${release_md}"
7375
release_md+=("${release_md}")

0 commit comments

Comments
 (0)