Skip to content

Commit 51379d8

Browse files
committed
workflows
if libtorrent RC_1_2 is not updated to work with boost 1.87.0 i'll need to have unique versions of boost per release. this change anticipates that outcome.
1 parent 469bad0 commit 51379d8

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

.github/workflows/matrix_multi_build_and_release_customs_tags.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,20 +238,23 @@ jobs:
238238
[[ -f "${release}" ]] && release+=("${release}")
239239
done
240240
revision="$(jq -r .revision 1\.2/*-dependency-version.json | head -n1)"
241+
boost="$(jq -r .boost 1\.2/*-dependency-version.json | head -n1)"
241242
fi
242243
243244
if [[ ${{ matrix.qbt_libtorrent_version }} == "2.0" ]]; then
244245
for release in 2\.0/*-release.md; do
245246
[[ -f "${release}" ]] && release+=("${release}")
246247
done
247248
revision="$(jq -r .revision 2\.0/*-dependency-version.json | head -n1)"
249+
boost="$(jq -r .boost 2\.0/*-dependency-version.json | head -n1)"
248250
fi
249251
250252
readarray -t release_sorted < <(printf '%s\n' "${release[@]}" | sort)
251253
252254
for dependency_version_files in 1\.2/*-dependency-version.json 2\.0/*-dependency-version.json; do
253255
if [[ -f "${dependency_version_files}" ]]; then
254-
sed -r 's/"revision": (.*)/PLACEHOLDER/g' -i "${dependency_version_files}"
256+
sed -r 's/"boost": (.*)/BOOST_PLACEHOLDER/g' -i "${dependency_version_files}"
257+
sed -r 's/"revision": (.*)/REVISION_PLACEHOLDER/g' -i "${dependency_version_files}"
255258
dependency_version+=("${dependency_version_files}")
256259
fi
257260
done
@@ -261,7 +264,8 @@ jobs:
261264
paste -d '\n' "${release_sorted[@]}" | uniq | awk '!(NF && seen[$0]++) || /^>/' > "tmp-release.md"
262265
paste -d '\n' "${dependency_version_sorted[@]}" | uniq | awk '!(NF && seen[$0]++)' > "dependency-version.json"
263266
264-
sed -i "s|PLACEHOLDER|\"revision\": \"${revision}\"|" dependency-version.json
267+
sed -i "s|BOOST_PLACEHOLDER|\"boost\": \"${boost}\"|" dependency-version.json
268+
sed -i "s|REVISION_PLACEHOLDER|\"revision\": \"${revision}\"|" dependency-version.json
265269
266270
./pandoc --wrap=preserve -f gfm tmp-release.md -t gfm -o release.md
267271

.github/workflows/matrix_multi_build_and_release_qbt_workflow_files.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,20 +230,23 @@ jobs:
230230
[[ -f "${release}" ]] && release+=("${release}")
231231
done
232232
revision="$(jq -r .revision 1\.2/*-dependency-version.json | head -n1)"
233+
boost="$(jq -r .boost 1\.2/*-dependency-version.json | head -n1)"
233234
fi
234235
235236
if [[ ${{ matrix.qbt_libtorrent_version }} == "2.0" ]]; then
236237
for release in 2\.0/*-release.md; do
237238
[[ -f "${release}" ]] && release+=("${release}")
238239
done
239240
revision="$(jq -r .revision 2\.0/*-dependency-version.json | head -n1)"
241+
boost="$(jq -r .boost 2\.0/*-dependency-version.json | head -n1)"
240242
fi
241243
242244
readarray -t release_sorted < <(printf '%s\n' "${release[@]}" | sort)
243245
244246
for dependency_version_files in 1\.2/*-dependency-version.json 2\.0/*-dependency-version.json; do
245247
if [[ -f "${dependency_version_files}" ]]; then
246-
sed -r 's/"revision": (.*)/PLACEHOLDER/g' -i "${dependency_version_files}"
248+
sed -r 's/"boost": (.*)/BOOST_PLACEHOLDER/g' -i "${dependency_version_files}"
249+
sed -r 's/"revision": (.*)/REVISION_PLACEHOLDER/g' -i "${dependency_version_files}"
247250
dependency_version+=("${dependency_version_files}")
248251
fi
249252
done
@@ -253,7 +256,8 @@ jobs:
253256
paste -d '\n' "${release_sorted[@]}" | uniq | awk '!(NF && seen[$0]++) || /^>/' > "tmp-release.md"
254257
paste -d '\n' "${dependency_version_sorted[@]}" | uniq | awk '!(NF && seen[$0]++)' > "dependency-version.json"
255258
256-
sed -i "s|PLACEHOLDER|\"revision\": \"${revision}\"|" dependency-version.json
259+
sed -i "s|BOOST_PLACEHOLDER|\"boost\": \"${boost}\"|" dependency-version.json
260+
sed -i "s|REVISION_PLACEHOLDER|\"revision\": \"${revision}\"|" dependency-version.json
257261
258262
./pandoc --wrap=preserve -f gfm tmp-release.md -t gfm -o release.md
259263

0 commit comments

Comments
 (0)