Skip to content

Commit f35e7a0

Browse files
committed
v2.0.12
v2.0.12
1 parent 4fbd75c commit f35e7a0

File tree

9 files changed

+844
-55
lines changed

9 files changed

+844
-55
lines changed

.editorconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,8 @@ indent_size = 2
4343
indent_size = 2
4444
indent_style = tab
4545
end_of_line = lf
46+
47+
[**.css]
48+
indent_size = 4
49+
indent_style = space
50+
end_of_line = lf

.github/workflows/matrix_multi_build_and_release_qbt_workflow_files.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,11 @@ jobs:
3838
# qbt_cross_name: [armel,armhf,armv7,aarch64,x86_64,x86,s390x,powerpc,ppc64el,mips,mipsel,mips64,mips64el,riscv64]
3939
qbt_cross_name: ["armhf", "armv7", "aarch64", "x86_64", "x86"]
4040
qbt_libtorrent_version: ["1.2", "2.0"]
41-
qbt_build_tool: ["", "qmake"]
41+
qbt_build_tool: [""]
4242
include:
43-
- qbt_build_tool: "qmake"
44-
qbt_qt_version_name: "qt5-"
45-
qbt_qt_version: "5"
4643
- qbt_build_tool: ""
4744
qbt_qt_version_name: ""
4845
qbt_qt_version: "6"
49-
- qbt_libtorrent_version: 1.2
50-
qbt_boost_tag: boost-1.86.0
5146

5247
name: "${{ matrix.qbt_cross_name }}-${{ matrix.qbt_qt_version_name }}libtorrent-v${{ matrix.qbt_libtorrent_version }}"
5348

@@ -126,7 +121,7 @@ jobs:
126121
run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh libtorrent
127122

128123
- name: Docker - double_conversion ${{ github.event.inputs.distinct_id }}
129-
if: matrix.qbt_build_tool == 'cmake'
124+
if: matrix.qbt_build_tool == ''
130125
run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh double_conversion
131126

132127
- name: Docker - qtbase ${{ github.event.inputs.distinct_id }}
@@ -174,7 +169,7 @@ jobs:
174169
!${{ env.qbt_build_dir }}/completed/*.png
175170
176171
- name: Host - Upload cmake graphs artifact ${{ github.event.inputs.distinct_id }}
177-
if: matrix.qbt_build_tool == 'cmake' && env.disable_qt5 != 'yes' # When qBittorrent v5 is released, remove this
172+
if: matrix.qbt_build_tool == '' && env.disable_qt5 != 'yes' # When qBittorrent v5 is released, remove this
178173
uses: actions/upload-artifact@v4
179174
with:
180175
name: "${{ matrix.qbt_cross_name }}-libtorrent-v${{ matrix.qbt_libtorrent_version }}-graphs"

changelog.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
### v2.0.12 - 17/12/2024
2+
3+
Default to `boost-1.86.0` for `RC_1_2` or `v1.2.x` builds because `RC_1_2` has not been updated to support the (depreciated) features removed in `boost-1.87.0` so the build will fail.
4+
5+
This method allows the user to override the setting by providing a valid boost tag using `qbt_boost_tag` or `-bt`
6+
7+
fix: changed `-bt | --boost-version` to `-bt | --boost-tag` for consistency. It was always supposed to be `--boost-tag` since that is what we are providing and testing via this flag.
8+
19
### v2.0.11 - 13/10/2024
210

311
Disable glib tests on zlib-ng https://github.com/userdocs/qbittorrent-nox-static/pull/173

0 commit comments

Comments
 (0)