Skip to content

Commit 6294e20

Browse files
LWWZHLWWZH
authored
Merge branch 'master' into feat/add-failed-attempts-column
2 parents 1eb1ca5 + 5a07050 commit 6294e20

305 files changed

Lines changed: 55581 additions & 1665 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ end_of_line = crlf
2929
end_of_line = crlf
3030

3131
# ignore paths
32-
[{dist/windows/3rdparty/*,src/base/3rdparty/*,src/lang/*.ts,src/webui/www/private/css/lib/*,src/webui/www/private/scripts/lib/*,src/webui/www/translations/*.ts}]
32+
[{dist/windows/3rdparty/*,src/base/3rdparty/**,src/lang/*.ts,src/webui/www/private/css/lib/*,src/webui/www/private/scripts/lib/*,src/webui/www/translations/*.ts}]
3333
charset = unset
3434
end_of_line = unset
3535
indent_style = unset

‎.github/workflows/ci_file_health.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
security-events: write
1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v6
19+
uses: actions/checkout@v7
2020
with:
2121
persist-credentials: false
2222

‎.github/workflows/ci_macos.yaml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,21 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
libtorrent:
22-
- version: "2.1.0-rc1"
22+
- version: "2.1.0"
2323
boost_major_version: "1"
2424
boost_minor_version: "91"
2525
boost_patch_version: "0"
26-
- version: "2.0.12"
26+
libt_build_flags: "-Dwebtorrent=ON"
27+
- version: "2.0.13"
2728
boost_major_version: "1"
2829
boost_minor_version: "91"
2930
boost_patch_version: "0"
31+
libt_build_flags: ""
3032
- version: "1.2.20"
3133
boost_major_version: "1"
3234
boost_minor_version: "86"
3335
boost_patch_version: "0"
36+
libt_build_flags: ""
3437
qbt_gui: ["GUI=ON", "GUI=OFF"]
3538
qt_version: ["6.10.3"]
3639

@@ -40,7 +43,7 @@ jobs:
4043

4144
steps:
4245
- name: Checkout repository
43-
uses: actions/checkout@v6
46+
uses: actions/checkout@v7
4447
with:
4548
persist-credentials: false
4649

@@ -109,13 +112,14 @@ jobs:
109112
-DCMAKE_CXX_STANDARD=20 \
110113
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
111114
-DBOOST_ROOT="${{ env.boost_path }}/lib/cmake" \
112-
-Ddeprecated-functions=OFF
115+
-Ddeprecated-functions=OFF \
116+
${{ matrix.libtorrent.libt_build_flags }}
113117
cmake --build build
114118
sudo cmake --install build
115119
116120
- name: Build qBittorrent
117121
run: |
118-
CXXFLAGS="$CXXFLAGS -DQT_FORCE_ASSERTS -Werror -Wno-error=deprecated-declarations" \
122+
CXXFLAGS="$CXXFLAGS -DQT_FORCE_ASSERTS -Werror -Wno-error=deprecated-declarations -Wno-error=deprecated-literal-operator" \
119123
LDFLAGS="$LDFLAGS -gz" \
120124
cmake \
121125
-B build \

‎.github/workflows/ci_python.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- name: Checkout repository
18-
uses: actions/checkout@v6
18+
uses: actions/checkout@v7
1919
with:
2020
persist-credentials: false
2121

‎.github/workflows/ci_ubuntu.yaml‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,21 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
libtorrent:
23-
- version: "2.1.0-rc1"
23+
- version: "2.1.0"
2424
boost_major_version: "1"
2525
boost_minor_version: "77"
2626
boost_patch_version: "0"
27-
- version: "2.0.12"
27+
libt_build_flags: "-Dwebtorrent=ON"
28+
- version: "2.0.13"
2829
boost_major_version: "1"
2930
boost_minor_version: "77"
3031
boost_patch_version: "0"
32+
libt_build_flags: ""
3133
- version: "1.2.20"
3234
boost_major_version: "1"
3335
boost_minor_version: "77"
3436
boost_patch_version: "0"
37+
libt_build_flags: ""
3538
qbt_gui: ["GUI=ON", "GUI=OFF"]
3639
qt_version: ["6.6.3"]
3740

@@ -42,7 +45,7 @@ jobs:
4245

4346
steps:
4447
- name: Checkout repository
45-
uses: actions/checkout@v6
48+
uses: actions/checkout@v7
4649
with:
4750
persist-credentials: false
4851

@@ -94,6 +97,7 @@ jobs:
9497
https://github.com/arvidn/libtorrent.git \
9598
${{ env.libtorrent_path }}
9699
cd ${{ env.libtorrent_path }}
100+
CFLAGS="$CFLAGS ${{ env.harden_flags }}" \
97101
CXXFLAGS="$CXXFLAGS ${{ env.harden_flags }}" \
98102
cmake \
99103
-B build \
@@ -103,20 +107,22 @@ jobs:
103107
-DCMAKE_CXX_STANDARD=20 \
104108
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
105109
-DBOOST_ROOT="${{ env.boost_path }}/lib/cmake" \
106-
-Ddeprecated-functions=OFF
110+
-Ddeprecated-functions=OFF \
111+
${{ matrix.libtorrent.libt_build_flags }}
107112
cmake --build build
108113
sudo cmake --install build
109114
110115
# to avoid scanning 3rdparty codebases, initialize it just before building qbt
111116
- name: Initialize CodeQL
112117
uses: github/codeql-action/init@v4
113-
if: startsWith(matrix.libtorrent.version, 2) && (matrix.qbt_gui == 'GUI=ON')
118+
if: startsWith(matrix.libtorrent.version, '2.0') && (matrix.qbt_gui == 'GUI=ON')
114119
with:
115120
config-file: ./.github/workflows/helper/codeql/cpp.yaml
116121
languages: cpp
117122

118123
- name: Build qBittorrent
119124
run: |
125+
CFLAGS="$CFLAGS ${{ env.harden_flags }}" \
120126
CXXFLAGS="$CXXFLAGS ${{ env.harden_flags }} -DQT_FORCE_ASSERTS -Werror" \
121127
LDFLAGS="$LDFLAGS -gz" \
122128
cmake \
@@ -141,9 +147,27 @@ jobs:
141147
142148
- name: Run CodeQL analysis
143149
uses: github/codeql-action/analyze@v4
144-
if: startsWith(matrix.libtorrent.version, 2) && (matrix.qbt_gui == 'GUI=ON')
150+
if: startsWith(matrix.libtorrent.version, '2.0') && (matrix.qbt_gui == 'GUI=ON')
145151
with:
146152
category: ${{ github.base_ref || github.ref_name }}
153+
output: sarif-results
154+
upload: failure-only
155+
156+
# Filter out results from 3rdparty codebases
157+
- name: Filter CodeQL results
158+
uses: advanced-security/filter-sarif@2da736ff05ef065cb2894ac6892e47b5eac2c3c0 # v1.1
159+
if: startsWith(matrix.libtorrent.version, '2.0') && (matrix.qbt_gui == 'GUI=ON')
160+
with:
161+
patterns: |
162+
-src/base/3rdparty/**
163+
input: sarif-results/cpp.sarif
164+
output: sarif-results/cpp.sarif
165+
166+
- name: Upload CodeQL SARIF
167+
uses: github/codeql-action/upload-sarif@v4
168+
if: startsWith(matrix.libtorrent.version, '2.0') && (matrix.qbt_gui == 'GUI=ON')
169+
with:
170+
sarif_file: sarif-results/cpp.sarif
147171

148172
- name: Prepare build artifacts
149173
run: |

‎.github/workflows/ci_webui.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@v6
24+
uses: actions/checkout@v7
2525
with:
2626
persist-credentials: false
2727

‎.github/workflows/ci_windows.yaml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,21 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
libtorrent:
22-
- version: "2.1.0-rc1"
22+
- version: "2.1.0"
2323
boost_major_version: "1"
2424
boost_minor_version: "91"
2525
boost_patch_version: "0"
26-
- version: "2.0.12"
26+
libt_build_flags: "-Dwebtorrent=ON"
27+
- version: "2.0.13"
2728
boost_major_version: "1"
2829
boost_minor_version: "91"
2930
boost_patch_version: "0"
31+
libt_build_flags: ""
3032
- version: "1.2.20"
3133
boost_major_version: "1"
3234
boost_minor_version: "86"
3335
boost_patch_version: "0"
36+
libt_build_flags: ""
3437
config:
3538
- os: windows-latest
3639
arch: x64
@@ -43,7 +46,7 @@ jobs:
4346

4447
steps:
4548
- name: Checkout repository
46-
uses: actions/checkout@v6
49+
uses: actions/checkout@v7
4750
with:
4851
persist-credentials: false
4952

@@ -135,6 +138,7 @@ jobs:
135138
https://github.com/arvidn/libtorrent.git `
136139
${{ env.libtorrent_path }}
137140
cd ${{ env.libtorrent_path }}
141+
$env:CFLAGS+=" /guard:cf"
138142
$env:CXXFLAGS+=" /guard:cf"
139143
$env:LDFLAGS+=" /GUARD:CF"
140144
cmake `
@@ -149,7 +153,8 @@ jobs:
149153
-DBUILD_SHARED_LIBS=OFF `
150154
-Ddeprecated-functions=OFF `
151155
-Dstatic_runtime=OFF `
152-
-DVCPKG_TARGET_TRIPLET=${{ matrix.config.arch }}-windows-static-md-release
156+
-DVCPKG_TARGET_TRIPLET=${{ matrix.config.arch }}-windows-static-md-release `
157+
${{ matrix.libtorrent.libt_build_flags }}
153158
cmake --build build
154159
cmake --install build
155160
@@ -224,7 +229,7 @@ jobs:
224229
path: upload
225230

226231
- name: Install NSIS
227-
uses: repolevedavaj/install-nsis@c14d0ea1b829818b4e9313d8e009b43f0a65fddd # v1.2.0
232+
uses: repolevedavaj/install-nsis@1ab2f7ba2fe9408db612029be0bb3c0088b0d3e9 # v1.2.1
228233
with:
229234
nsis-version: '3.12'
230235

‎.github/workflows/coverity-scan.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ jobs:
1515
strategy:
1616
matrix:
1717
libtorrent:
18-
- version: "2.0.12"
18+
- version: "2.0.13"
1919
boost_major_version: "1"
2020
boost_minor_version: "91"
2121
boost_patch_version: "0"
22+
libt_build_flags: ""
2223
qbt_gui: ["GUI=ON"]
2324
qt_version: ["6.10.3"]
2425

@@ -29,7 +30,7 @@ jobs:
2930

3031
steps:
3132
- name: Checkout repository
32-
uses: actions/checkout@v6
33+
uses: actions/checkout@v7
3334
with:
3435
persist-credentials: false
3536

@@ -78,7 +79,8 @@ jobs:
7879
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
7980
-DCMAKE_CXX_STANDARD=20 \
8081
-DBOOST_ROOT="${{ env.boost_path }}/lib/cmake" \
81-
-Ddeprecated-functions=OFF
82+
-Ddeprecated-functions=OFF \
83+
${{ matrix.libtorrent.libt_build_flags }}
8284
cmake --build build
8385
sudo cmake --install build
8486

‎.github/workflows/helper/pre-commit/.markdownlint.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# https://github.com/updownpress/markdown-lint/tree/master/rules
2+
3+
MD013: false

‎.pre-commit-config.yaml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ repos:
3131
name: Check trailing newlines
3232
exclude: |
3333
(?x)^(
34+
src/base/3rdparty/.* |
3435
src/webui/www/private/css/lib/.* |
3536
src/webui/www/private/scripts/lib/.* |
3637
test/testdata/crlf.txt
@@ -39,6 +40,18 @@ repos:
3940
- svg
4041
- ts
4142

43+
- repo: https://github.com/igorshubovych/markdownlint-cli.git
44+
rev: v0.49.0
45+
hooks:
46+
- id: markdownlint
47+
name: Check Markdown files
48+
args: ["--config", ".github/workflows/helper/pre-commit/.markdownlint.yaml"]
49+
exclude: |
50+
(?x)^(
51+
doc/.*/qbittorrent\.1\.md |
52+
doc/.*/qbittorrent-nox\.1\.md
53+
)$
54+
4255
- repo: https://github.com/editorconfig-checker/editorconfig-checker.python.git
4356
rev: 3.6.1
4457
hooks:
@@ -65,7 +78,7 @@ repos:
6578
- ts
6679

6780
- repo: https://github.com/crate-ci/typos.git
68-
rev: v1.46.0
81+
rev: v1.48.0
6982
hooks:
7083
- id: typos
7184
name: Check spelling (typos)

0 commit comments

Comments
 (0)