Skip to content

Commit 646a6e5

Browse files
userdocsuserdocs
committed
missing comma
Update matrix_multi_build_and_release_qbt_workflow_files.yml 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. Update matrix_multi_build_and_release_qbt_workflow_files.yml
1 parent 469bad0 commit 646a6e5

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
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: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ jobs:
4646
- qbt_build_tool: ""
4747
qbt_qt_version_name: ""
4848
qbt_qt_version: "6"
49+
- qbt_libtorrent_version: 1.2
50+
qbt_boost_tag: boost-1.86.0
4951

5052
name: "${{ matrix.qbt_cross_name }}-${{ matrix.qbt_qt_version_name }}libtorrent-v${{ matrix.qbt_libtorrent_version }}"
5153

@@ -76,7 +78,7 @@ jobs:
7678
printf '%s\n' "qbt_cross_name=${{ matrix.qbt_cross_name }}" >> env.custom
7779
printf '%s\n' "qbt_patches_url=${{ github.repository }}" >> env.custom
7880
printf '%s\n' "qbt_skip_icu=yes" >> env.custom
79-
printf '%s\n' "qbt_boost_tag=" >> env.custom
81+
printf '%s\n' "qbt_boost_tag=${{ matrix.qbt_boost_tag }}" >> env.custom
8082
printf '%s\n' "qbt_libtorrent_tag=" >> env.custom
8183
printf '%s\n' "qbt_qt_tag=" >> env.custom
8284
printf '%s\n' "qbt_qbittorrent_tag=" >> env.custom
@@ -87,7 +89,7 @@ jobs:
8789
printf '%s\n' "qbt_optimise_strip=yes" >> env.custom
8890
printf '%s\n' "qbt_build_debug=no" >> env.custom
8991
printf '%s\n' "qbt_revision_url=${{ github.repository }}" >> env.custom
90-
printf '%s\n' "qbt_standard=17" >> env.custom
92+
printf '%s\n' "qbt_standard=" >> env.custom
9193
printf '%s\n' "qbt_static_ish=no" >> env.custom
9294
9395
- name: Host - Create docker multiarch container ${{ github.event.inputs.distinct_id }}
@@ -230,20 +232,23 @@ jobs:
230232
[[ -f "${release}" ]] && release+=("${release}")
231233
done
232234
revision="$(jq -r .revision 1\.2/*-dependency-version.json | head -n1)"
235+
boost="$(jq -r .boost 1\.2/*-dependency-version.json | head -n1)"
233236
fi
234237
235238
if [[ ${{ matrix.qbt_libtorrent_version }} == "2.0" ]]; then
236239
for release in 2\.0/*-release.md; do
237240
[[ -f "${release}" ]] && release+=("${release}")
238241
done
239242
revision="$(jq -r .revision 2\.0/*-dependency-version.json | head -n1)"
243+
boost="$(jq -r .boost 2\.0/*-dependency-version.json | head -n1)"
240244
fi
241245
242246
readarray -t release_sorted < <(printf '%s\n' "${release[@]}" | sort)
243247
244248
for dependency_version_files in 1\.2/*-dependency-version.json 2\.0/*-dependency-version.json; do
245249
if [[ -f "${dependency_version_files}" ]]; then
246-
sed -r 's/"revision": (.*)/PLACEHOLDER/g' -i "${dependency_version_files}"
250+
sed -r 's/"boost": (.*)/BOOST_PLACEHOLDER/g' -i "${dependency_version_files}"
251+
sed -r 's/"revision": (.*)/REVISION_PLACEHOLDER/g' -i "${dependency_version_files}"
247252
dependency_version+=("${dependency_version_files}")
248253
fi
249254
done
@@ -253,7 +258,8 @@ jobs:
253258
paste -d '\n' "${release_sorted[@]}" | uniq | awk '!(NF && seen[$0]++) || /^>/' > "tmp-release.md"
254259
paste -d '\n' "${dependency_version_sorted[@]}" | uniq | awk '!(NF && seen[$0]++)' > "dependency-version.json"
255260
256-
sed -i "s|PLACEHOLDER|\"revision\": \"${revision}\"|" dependency-version.json
261+
sed -i "s|BOOST_PLACEHOLDER|\"boost\": \"${boost}\",|" dependency-version.json
262+
sed -i "s|REVISION_PLACEHOLDER|\"revision\": \"${revision}\"|" dependency-version.json
257263
258264
./pandoc --wrap=preserve -f gfm tmp-release.md -t gfm -o release.md
259265

‎qbittorrent-nox-static.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ _qbittorrent_build_cons() {
492492
_set_build_cons() {
493493
if [[ $(_qbittorrent_build_cons) == "yes" && "${qbt_qt_version}" == "5" ]]; then
494494
printf '\n%b\n\n' " ${text_blink}${unicode_red_light_circle}${color_end} ${color_yellow}qBittorrent ${color_magenta}${github_tag[qbittorrent]}${color_yellow} does not support ${color_red}Qt5${color_yellow}. Please use ${color_green}Qt6${color_yellow} or a qBittorrent ${color_green}v4${color_yellow} tag.${color_end}"
495-
if [[ -d "${release_info_dir}" ]]; then touch "${release_info_dir}/disable-qt5"; fi # qbittorrent v5 transtion - workflow specific
495+
if [[ -d "${release_info_dir}" ]]; then touch "${release_info_dir}/disable-qt5"; fi # qbittorrent v5 transition - workflow specific
496496
exit # non error exit to not upset github actions - just skip the step
497497
fi
498498
}

0 commit comments

Comments
 (0)