From 646a6e5ca5f42f1c7c52a09177a82b3f83634cf0 Mon Sep 17 00:00:00 2001 From: userdocs <16525024+userdocs@users.noreply.github.com> Date: Thu, 5 Dec 2024 08:50:21 +0000 Subject: [PATCH] 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 --- ...matrix_multi_build_and_release_customs_tags.yml | 8 ++++++-- ..._multi_build_and_release_qbt_workflow_files.yml | 14 ++++++++++---- qbittorrent-nox-static.sh | 2 +- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.github/workflows/matrix_multi_build_and_release_customs_tags.yml b/.github/workflows/matrix_multi_build_and_release_customs_tags.yml index eae86d61..de81f40b 100644 --- a/.github/workflows/matrix_multi_build_and_release_customs_tags.yml +++ b/.github/workflows/matrix_multi_build_and_release_customs_tags.yml @@ -238,6 +238,7 @@ jobs: [[ -f "${release}" ]] && release+=("${release}") done revision="$(jq -r .revision 1\.2/*-dependency-version.json | head -n1)" + boost="$(jq -r .boost 1\.2/*-dependency-version.json | head -n1)" fi if [[ ${{ matrix.qbt_libtorrent_version }} == "2.0" ]]; then @@ -245,13 +246,15 @@ jobs: [[ -f "${release}" ]] && release+=("${release}") done revision="$(jq -r .revision 2\.0/*-dependency-version.json | head -n1)" + boost="$(jq -r .boost 2\.0/*-dependency-version.json | head -n1)" fi readarray -t release_sorted < <(printf '%s\n' "${release[@]}" | sort) for dependency_version_files in 1\.2/*-dependency-version.json 2\.0/*-dependency-version.json; do if [[ -f "${dependency_version_files}" ]]; then - sed -r 's/"revision": (.*)/PLACEHOLDER/g' -i "${dependency_version_files}" + sed -r 's/"boost": (.*)/BOOST_PLACEHOLDER/g' -i "${dependency_version_files}" + sed -r 's/"revision": (.*)/REVISION_PLACEHOLDER/g' -i "${dependency_version_files}" dependency_version+=("${dependency_version_files}") fi done @@ -261,7 +264,8 @@ jobs: paste -d '\n' "${release_sorted[@]}" | uniq | awk '!(NF && seen[$0]++) || /^>/' > "tmp-release.md" paste -d '\n' "${dependency_version_sorted[@]}" | uniq | awk '!(NF && seen[$0]++)' > "dependency-version.json" - sed -i "s|PLACEHOLDER|\"revision\": \"${revision}\"|" dependency-version.json + sed -i "s|BOOST_PLACEHOLDER|\"boost\": \"${boost}\"|" dependency-version.json + sed -i "s|REVISION_PLACEHOLDER|\"revision\": \"${revision}\"|" dependency-version.json ./pandoc --wrap=preserve -f gfm tmp-release.md -t gfm -o release.md diff --git a/.github/workflows/matrix_multi_build_and_release_qbt_workflow_files.yml b/.github/workflows/matrix_multi_build_and_release_qbt_workflow_files.yml index 1b928b29..9bb5305e 100644 --- a/.github/workflows/matrix_multi_build_and_release_qbt_workflow_files.yml +++ b/.github/workflows/matrix_multi_build_and_release_qbt_workflow_files.yml @@ -46,6 +46,8 @@ jobs: - qbt_build_tool: "" qbt_qt_version_name: "" qbt_qt_version: "6" + - qbt_libtorrent_version: 1.2 + qbt_boost_tag: boost-1.86.0 name: "${{ matrix.qbt_cross_name }}-${{ matrix.qbt_qt_version_name }}libtorrent-v${{ matrix.qbt_libtorrent_version }}" @@ -76,7 +78,7 @@ jobs: printf '%s\n' "qbt_cross_name=${{ matrix.qbt_cross_name }}" >> env.custom printf '%s\n' "qbt_patches_url=${{ github.repository }}" >> env.custom printf '%s\n' "qbt_skip_icu=yes" >> env.custom - printf '%s\n' "qbt_boost_tag=" >> env.custom + printf '%s\n' "qbt_boost_tag=${{ matrix.qbt_boost_tag }}" >> env.custom printf '%s\n' "qbt_libtorrent_tag=" >> env.custom printf '%s\n' "qbt_qt_tag=" >> env.custom printf '%s\n' "qbt_qbittorrent_tag=" >> env.custom @@ -87,7 +89,7 @@ jobs: printf '%s\n' "qbt_optimise_strip=yes" >> env.custom printf '%s\n' "qbt_build_debug=no" >> env.custom printf '%s\n' "qbt_revision_url=${{ github.repository }}" >> env.custom - printf '%s\n' "qbt_standard=17" >> env.custom + printf '%s\n' "qbt_standard=" >> env.custom printf '%s\n' "qbt_static_ish=no" >> env.custom - name: Host - Create docker multiarch container ${{ github.event.inputs.distinct_id }} @@ -230,6 +232,7 @@ jobs: [[ -f "${release}" ]] && release+=("${release}") done revision="$(jq -r .revision 1\.2/*-dependency-version.json | head -n1)" + boost="$(jq -r .boost 1\.2/*-dependency-version.json | head -n1)" fi if [[ ${{ matrix.qbt_libtorrent_version }} == "2.0" ]]; then @@ -237,13 +240,15 @@ jobs: [[ -f "${release}" ]] && release+=("${release}") done revision="$(jq -r .revision 2\.0/*-dependency-version.json | head -n1)" + boost="$(jq -r .boost 2\.0/*-dependency-version.json | head -n1)" fi readarray -t release_sorted < <(printf '%s\n' "${release[@]}" | sort) for dependency_version_files in 1\.2/*-dependency-version.json 2\.0/*-dependency-version.json; do if [[ -f "${dependency_version_files}" ]]; then - sed -r 's/"revision": (.*)/PLACEHOLDER/g' -i "${dependency_version_files}" + sed -r 's/"boost": (.*)/BOOST_PLACEHOLDER/g' -i "${dependency_version_files}" + sed -r 's/"revision": (.*)/REVISION_PLACEHOLDER/g' -i "${dependency_version_files}" dependency_version+=("${dependency_version_files}") fi done @@ -253,7 +258,8 @@ jobs: paste -d '\n' "${release_sorted[@]}" | uniq | awk '!(NF && seen[$0]++) || /^>/' > "tmp-release.md" paste -d '\n' "${dependency_version_sorted[@]}" | uniq | awk '!(NF && seen[$0]++)' > "dependency-version.json" - sed -i "s|PLACEHOLDER|\"revision\": \"${revision}\"|" dependency-version.json + sed -i "s|BOOST_PLACEHOLDER|\"boost\": \"${boost}\",|" dependency-version.json + sed -i "s|REVISION_PLACEHOLDER|\"revision\": \"${revision}\"|" dependency-version.json ./pandoc --wrap=preserve -f gfm tmp-release.md -t gfm -o release.md diff --git a/qbittorrent-nox-static.sh b/qbittorrent-nox-static.sh index f07148cd..53257aeb 100644 --- a/qbittorrent-nox-static.sh +++ b/qbittorrent-nox-static.sh @@ -492,7 +492,7 @@ _qbittorrent_build_cons() { _set_build_cons() { if [[ $(_qbittorrent_build_cons) == "yes" && "${qbt_qt_version}" == "5" ]]; then 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}" - if [[ -d "${release_info_dir}" ]]; then touch "${release_info_dir}/disable-qt5"; fi # qbittorrent v5 transtion - workflow specific + if [[ -d "${release_info_dir}" ]]; then touch "${release_info_dir}/disable-qt5"; fi # qbittorrent v5 transition - workflow specific exit # non error exit to not upset github actions - just skip the step fi }