Skip to content

Commit b7292e4

Browse files
userdocsuserdocs
committed
v2.1.0
docs Update qbittorrent-nox-static.sh Update changelog.md Update deploy.yml v.2.1.0 V2.1.0 v2.1.0 v2.1.0 v2.1.0 docs v2.1.0 v2.1.0 v2.1.0 workflows docs
1 parent 574f360 commit b7292e4

File tree

18 files changed

+3928
-526
lines changed

18 files changed

+3928
-526
lines changed

‎.github/workflows/ci-alpine-build.yml‎

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ on:
2020
description: "debug builds"
2121
required: true
2222
type: string
23-
23+
script_name:
24+
description: "script name"
25+
required: true
26+
type: string
2427
jobs:
2528
build-alpine:
2629
runs-on: ubuntu-24.04
@@ -44,6 +47,7 @@ jobs:
4447

4548
env:
4649
qbt_build_dir: "qbt-build"
50+
script_name: ${{ inputs.script_name }}
4751

4852
steps:
4953
- name: Checkout ${{ inputs.distinct_id }}
@@ -57,8 +61,8 @@ jobs:
5761
- name: Host - update ${{ inputs.distinct_id }}
5862
run: sudo apt-get update
5963

60-
- name: Host - upgrade ${{ inputs.distinct_id }}
61-
run: sudo apt-get -y upgrade
64+
# - name: Host - upgrade ${{ inputs.distinct_id }}
65+
# run: sudo apt-get -y upgrade
6266

6367
- name: Host - set up qemu-user-static binfmt-support ${{ inputs.distinct_id }}
6468
run: sudo apt install libpipeline1 qemu-user-static binfmt-support
@@ -76,10 +80,10 @@ jobs:
7680
printf '%s\n' "qbt_cross_name=${{ matrix.qbt_cross_name }}" >> env.custom
7781
printf '%s\n' "qbt_patches_url=${{ github.repository }}" >> env.custom
7882
printf '%s\n' "qbt_skip_icu=${set_skip_icu}" >> env.custom
79-
printf '%s\n' "qbt_boost_tag=" >> env.custom
80-
printf '%s\n' "qbt_libtorrent_tag=" >> env.custom
81-
printf '%s\n' "qbt_qt_tag=" >> env.custom
82-
printf '%s\n' "qbt_qbittorrent_tag=" >> env.custom
83+
printf '%s\n' "qbt_boost_tag=${{ matrix.qbt_boost_tag }}" >> env.custom
84+
printf '%s\n' "qbt_libtorrent_tag=${{ matrix.qbt_libtorrent_tag }}" >> env.custom
85+
printf '%s\n' "qbt_qt_tag=${{ matrix.qbt_qt_tag }}" >> env.custom
86+
printf '%s\n' "qbt_qbittorrent_tag=${{ matrix.qbt_qbittorrent_tag }}" >> env.custom
8387
printf '%s\n' "qbt_libtorrent_master_jamfile=" >> env.custom
8488
printf '%s\n' "qbt_workflow_files=${set_workflow_files}" >> env.custom
8589
printf '%s\n' "qbt_workflow_artifacts=" >> env.custom
@@ -99,8 +103,11 @@ jobs:
99103
- name: Docker - apk install bash ${{ inputs.distinct_id }}
100104
run: docker exec -w /root multiarch apk add bash
101105

102-
- name: Docker - Bootstrap ${{ inputs.distinct_id }}
103-
run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh -bs-a
106+
- name: Docker - Bootstrap deps ${{ inputs.distinct_id }}
107+
run: docker exec -w /root multiarch bash ${script_name} bootstrap_deps
108+
109+
- name: Docker - Bootstrap build ${{ inputs.distinct_id }}
110+
run: docker exec -w /root multiarch bash ${script_name} -bs-a
104111

105112
- name: Host - qBittorrent v5 transition ${{ inputs.distinct_id }}
106113
run: |
@@ -109,49 +116,45 @@ jobs:
109116
printf '%s\n' "Found file: \`disable-qt5\`: settings \`disable_qt5=yes\` to yes" >> $GITHUB_STEP_SUMMARY
110117
fi
111118
112-
# - name: Docker - Copy repo patches to build folder ${{ inputs.distinct_id }}
113-
# if: env.disable_qt5 != 'yes'
114-
# run: if [[ -d patches ]]; then docker exec -w /root multiarch cp -r patches/* /root/${{ env.qbt_build_dir }}/patches; fi
115-
116119
- name: Docker - zlib-ng ${{ inputs.distinct_id }}
117120
if: env.disable_qt5 != 'yes'
118-
run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh zlib
121+
run: docker exec -w /root multiarch bash ${script_name} zlib
119122

120123
- name: Docker - iconv ${{ inputs.distinct_id }}
121124
if: env.disable_qt5 != 'yes'
122-
run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh iconv
125+
run: docker exec -w /root multiarch bash ${script_name} iconv
123126

124127
- name: Docker - icu ${{ inputs.distinct_id }}
125128
if: env.disable_qt5 != 'yes'
126-
run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh icu
129+
run: docker exec -w /root multiarch bash ${script_name} icu
127130

128131
- name: Docker - openssl ${{ inputs.distinct_id }}
129132
if: env.disable_qt5 != 'yes'
130-
run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh openssl
133+
run: docker exec -w /root multiarch bash ${script_name} openssl
131134

132135
- name: Docker - boost ${{ inputs.distinct_id }}
133136
if: env.disable_qt5 != 'yes'
134-
run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh boost
137+
run: docker exec -w /root multiarch bash ${script_name} boost
135138

136139
- name: Docker - libtorrent ${{ inputs.distinct_id }}
137140
if: env.disable_qt5 != 'yes'
138-
run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh libtorrent
141+
run: docker exec -w /root multiarch bash ${script_name} libtorrent
139142

140143
- name: Docker - double_conversion ${{ inputs.distinct_id }}
141144
if: matrix.qbt_build_tool == '' && env.disable_qt5 != 'yes'
142-
run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh double_conversion
145+
run: docker exec -w /root multiarch bash ${script_name} double_conversion
143146

144147
- name: Docker - qtbase ${{ inputs.distinct_id }}
145148
if: env.disable_qt5 != 'yes'
146-
run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh qtbase
149+
run: docker exec -w /root multiarch bash ${script_name} qtbase
147150

148151
- name: Docker - qttools ${{ inputs.distinct_id }}
149152
if: env.disable_qt5 != 'yes'
150-
run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh qttools
153+
run: docker exec -w /root multiarch bash ${script_name} qttools
151154

152155
- name: Docker - qbittorrent ${{ inputs.distinct_id }}
153156
if: env.disable_qt5 != 'yes'
154-
run: docker exec -w /root multiarch bash qbittorrent-nox-static.sh qbittorrent
157+
run: docker exec -w /root multiarch bash ${script_name} qbittorrent
155158

156159
- name: Docker - Set release asset name ${{ inputs.distinct_id }}
157160
if: env.disable_qt5 != 'yes'
@@ -168,7 +171,7 @@ jobs:
168171
run: docker exec -w /root/${{ env.qbt_build_dir }}/release_info multiarch bash -c 'mv *.md *.json '/root/${{ env.qbt_build_dir }}/completed''
169172

170173
- name: Host - Upload libtorrent-v${{ matrix.qbt_libtorrent_version }}-qbittorrent-nox and release info artifact ${{ inputs.distinct_id }}
171-
if: env.disable_qt5 != 'yes'
174+
if: success() && env.disable_qt5 != 'yes'
172175
uses: actions/upload-artifact@v4
173176
with:
174177
name: libtorrent-v${{ matrix.qbt_libtorrent_version }}-${{ matrix.qbt_cross_name }}-${{ matrix.qbt_qt_version_name }}qbittorrent-nox
@@ -177,8 +180,15 @@ jobs:
177180
!${{ env.qbt_build_dir }}/completed/*.png
178181
179182
- name: Host - Upload cmake graphs artifact ${{ inputs.distinct_id }}
180-
if: matrix.qbt_build_tool == '' && env.disable_qt5 != 'yes'
183+
if: success() && matrix.qbt_build_tool == '' && env.disable_qt5 != 'yes'
181184
uses: actions/upload-artifact@v4
182185
with:
183186
name: "${{ matrix.qbt_cross_name }}-libtorrent-v${{ matrix.qbt_libtorrent_version }}-graphs"
184187
path: "${{ env.qbt_build_dir }}/completed/*.png"
188+
189+
- name: Host - Upload logs on error
190+
if: failure() && env.disable_qt5 != 'yes'
191+
uses: actions/upload-artifact@v4
192+
with:
193+
name: "${{ matrix.qbt_cross_name }}-libtorrent-v${{ matrix.qbt_libtorrent_version }}-logs"
194+
path: "${{ env.qbt_build_dir }}/logs/*"

‎.github/workflows/ci-checks.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ concurrency:
1111
jobs:
1212
sh-checker:
1313
runs-on: ubuntu-24.04
14+
permissions:
15+
contents: read
1416
steps:
1517
- uses: actions/checkout@v4
1618
with:
@@ -28,6 +30,8 @@ jobs:
2830

2931
zizmor-checker:
3032
runs-on: ubuntu-24.04
33+
permissions:
34+
contents: read
3135
steps:
3236
- uses: actions/checkout@v4
3337
with:
@@ -51,6 +55,8 @@ jobs:
5155
5256
editorconfig-checker:
5357
runs-on: ubuntu-24.04
58+
permissions:
59+
contents: read
5460
steps:
5561
- uses: actions/checkout@v4
5662
with:
@@ -68,4 +74,3 @@ jobs:
6874
printf '%b' "\`\`\`" >> $GITHUB_STEP_SUMMARY
6975
7076
# exit "${exit_code}"
71-

‎.github/workflows/ci-debian-build.yml‎

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ on:
1919
description: "debug builds"
2020
required: true
2121
type: string
22+
script_name:
23+
description: "script name"
24+
required: true
25+
type: string
2226

2327
jobs:
2428
build:
@@ -30,18 +34,12 @@ jobs:
3034
fail-fast: false
3135
matrix:
3236
container_id: [debian, ubuntu]
33-
container_codename: [bookworm, jammy, noble]
37+
container_codename: [bookworm, noble]
3438
qbt_build_tool: ["cmake", "qmake"]
3539
qbt_libtorrent_version: ["1.2", "2.0"]
3640
exclude:
37-
- container_id: debian
38-
container_codename: focal
39-
- container_id: debian
40-
container_codename: jammy
4141
- container_id: debian
4242
container_codename: noble
43-
- container_id: ubuntu
44-
container_codename: bullseye
4543
- container_id: ubuntu
4644
container_codename: bookworm
4745
include:
@@ -51,10 +49,13 @@ jobs:
5149
qbt_qt_version: "6"
5250

5351
name: "${{ matrix.container_id }}-${{ matrix.container_codename }}-${{ matrix.qbt_libtorrent_version }}-qt-${{ matrix.qbt_qt_version }}-${{ matrix.qbt_build_tool }}"
52+
5453
env: # host
5554
qbt_build_dir: "qbt-build"
5655
disable_qt5: ""
5756
artifact_name: "${{ matrix.container_id }}-${{ matrix.container_codename }}-${{ matrix.qbt_libtorrent_version }}-qt-${{ matrix.qbt_qt_version }}-${{ matrix.qbt_build_tool }}-nox"
57+
script_name: ${{ inputs.script_name }}
58+
5859
container:
5960
image: ${{ matrix.container_id }}:${{ matrix.container_codename }}
6061
env: # container
@@ -66,13 +67,13 @@ jobs:
6667
qbt_libtorrent_version: ${{ matrix.qbt_libtorrent_version }}
6768
qbt_qt_version: ${{ matrix.qbt_qt_version }}
6869
qbt_build_tool: ${{ matrix.qbt_build_tool }}
69-
qbt_cross_name: ""
70+
qbt_cross_name: ${{ matrix.qbt_cross_name }}
7071
qbt_patches_url: ${{ github.repository }}
7172
qbt_skip_icu: ${{ inputs.icu }}
72-
qbt_boost_tag: ""
73-
qbt_libtorrent_tag: ""
74-
qbt_qt_tag: ""
75-
qbt_qbittorrent_tag: ""
73+
qbt_boost_tag: ${{ matrix.qbt_boost_tag }}
74+
qbt_libtorrent_tag: ${{ matrix.qbt_libtorrent_tag }}
75+
qbt_qt_tag: ${{ matrix.qbt_qt_tag }}
76+
qbt_qbittorrent_tag: ${{ matrix.qbt_qbittorrent_tag }}
7677
qbt_libtorrent_master_jamfile: ""
7778
qbt_workflow_files: ${{ inputs.workflow-files }}
7879
qbt_workflow_artifacts: ""
@@ -88,11 +89,11 @@ jobs:
8889
with:
8990
persist-credentials: false
9091

91-
- name: Bootstrap all ${{ inputs.distinct_id }}
92-
run: bash qbittorrent-nox-static.sh -bs-a
92+
- name: Bootstrap deps ${{ inputs.distinct_id }}
93+
run: bash ${script_name} bootstrap_deps
9394

94-
- name: Host - qBittorrent v5 transition ${{ inputs.distinct_id }}
95-
run: |
95+
- name: Bootstrap build ${{ inputs.distinct_id }}
96+
run: bash ${script_name} -bs-a
9697

9798
- name: Host - qBittorrent v5 transition ${{ inputs.distinct_id }}
9899
run: |
@@ -103,51 +104,58 @@ jobs:
103104
104105
- name: glibc ${{ inputs.distinct_id }}
105106
if: env.disable_qt5 != 'yes'
106-
run: bash qbittorrent-nox-static.sh glibc
107+
run: bash ${script_name} glibc
107108

108109
- name: zlib ${{ inputs.distinct_id }}
109110
if: env.disable_qt5 != 'yes'
110-
run: bash qbittorrent-nox-static.sh zlib
111+
run: bash ${script_name} zlib
111112

112113
- name: iconv ${{ inputs.distinct_id }}
113114
if: env.disable_qt5 != 'yes'
114-
run: bash qbittorrent-nox-static.sh iconv
115+
run: bash ${script_name} iconv
115116

116117
- name: icu ${{ inputs.distinct_id }}
117118
if: env.disable_qt5 != 'yes'
118-
run: bash qbittorrent-nox-static.sh icu
119+
run: bash ${script_name} icu
119120

120121
- name: openssl ${{ inputs.distinct_id }}
121122
if: env.disable_qt5 != 'yes'
122-
run: bash qbittorrent-nox-static.sh openssl
123+
run: bash ${script_name} openssl
123124

124125
- name: boost ${{ inputs.distinct_id }}
125126
if: env.disable_qt5 != 'yes'
126-
run: bash qbittorrent-nox-static.sh boost
127+
run: bash ${script_name} boost
127128

128129
- name: libtorrent ${{ inputs.distinct_id }}
129130
if: env.disable_qt5 != 'yes'
130-
run: bash qbittorrent-nox-static.sh libtorrent
131+
run: bash ${script_name} libtorrent
131132

132133
- name: double conversion ${{ inputs.distinct_id }}
133134
if: env.disable_qt5 != 'yes' && matrix.qbt_build_tool == 'cmake'
134-
run: bash qbittorrent-nox-static.sh double_conversion
135+
run: bash ${script_name} double_conversion
135136

136137
- name: qtbase ${{ inputs.distinct_id }}
137138
if: env.disable_qt5 != 'yes'
138-
run: bash qbittorrent-nox-static.sh qtbase
139+
run: bash ${script_name} qtbase
139140

140141
- name: qttools ${{ inputs.distinct_id }}
141142
if: env.disable_qt5 != 'yes'
142-
run: bash qbittorrent-nox-static.sh qttools
143+
run: bash ${script_name} qttools
143144

144145
- name: qbittorrent ${{ inputs.distinct_id }}
145146
if: env.disable_qt5 != 'yes'
146-
run: bash qbittorrent-nox-static.sh qbittorrent
147+
run: bash ${script_name} qbittorrent
147148

148149
- name: Upload ${{ env.artifact_name }} artifacts ${{ inputs.distinct_id }}
149150
if: env.disable_qt5 != 'yes'
150151
uses: actions/upload-artifact@v4
151152
with:
152153
name: ${{ env.artifact_name }}
153154
path: ${{ env.qbt_build_dir }}/completed/qbittorrent-nox
155+
156+
- name: Host - Upload logs on error
157+
if: failure() && env.disable_qt5 != 'yes'
158+
uses: actions/upload-artifact@v4
159+
with:
160+
name: "${{ env.artifact_name }}-logs"
161+
path: "${{ env.qbt_build_dir }}"

‎.github/workflows/ci-main-reusable-caller.yml‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ name: ci - main reusable caller
44
on:
55
workflow_dispatch:
66
inputs:
7+
script_name:
8+
description: "Which script to run?"
9+
required: true
10+
default: "qbt-nox-static.bash"
11+
type: choice
12+
options: ["qbt-nox-static.bash", "qbittorrent-nox-static.sh"]
713
debian-build:
814
description: "Debian: build"
915
required: true
@@ -51,21 +57,26 @@ on:
5157
options: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
5258

5359
concurrency:
54-
group: ci-main-reusable-caller
60+
group: ${{ github.workflow }}
5561
cancel-in-progress: true
5662

63+
permissions: {}
64+
5765
jobs:
5866
ci-debian-build:
5967
if: always() && github.event.inputs.debian-build == 'true'
6068
concurrency:
6169
group: ci-debian-build
6270
cancel-in-progress: true
71+
permissions:
72+
contents: read
6373
uses: ./.github/workflows/ci-debian-build.yml
6474
with:
6575
distinct_id: ${{ github.event.inputs.distinct_id }}
6676
workflow-files: ${{ github.event.inputs.workflow-files == 'true' && 'yes' || 'no' }}
6777
icu: ${{ github.event.inputs.icu == 'true' && 'no' || 'yes' }}
6878
debug: ${{ github.event.inputs.debug == 'true' && 'yes' || 'no' }}
79+
script_name: ${{ github.event.inputs.script_name }}
6980

7081
ci-alpine-build:
7182
if: always() && github.event.inputs.alpine-build == 'true'
@@ -82,6 +93,7 @@ jobs:
8293
workflow-files: ${{ github.event.inputs.workflow-files == 'true' && 'yes' || 'no' }}
8394
icu: ${{ github.event.inputs.icu == 'true' && 'no' || 'yes' }}
8495
debug: ${{ github.event.inputs.debug == 'true' && 'yes' || 'no' }}
96+
script_name: ${{ github.event.inputs.script_name }}
8597

8698
ci-alpine-release:
8799
needs: [ci-alpine-build]

‎.github/workflows/deploy.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ on:
1313
jobs:
1414
build:
1515
runs-on: ubuntu-latest
16+
permissions:
17+
contents: read
1618
steps:
1719
- name: Checkout your repository using git
1820
uses: actions/checkout@v4

0 commit comments

Comments
 (0)