Skip to content

Commit 286a414

Browse files
userdocsuserdocs
committed
workflows
1 parent abcca06 commit 286a414

File tree

3 files changed

+52
-27
lines changed

3 files changed

+52
-27
lines changed

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

Lines changed: 17 additions & 13 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 }}
@@ -100,10 +104,10 @@ jobs:
100104
run: docker exec -w /root multiarch apk add bash
101105

102106
- name: Docker - Bootstrap deps ${{ inputs.distinct_id }}
103-
run: docker exec -w /root multiarch bash qbt-nox-static.bash bootstrap_deps
107+
run: docker exec -w /root multiarch bash ${script_name} bootstrap_deps
104108

105109
- name: Docker - Bootstrap build ${{ inputs.distinct_id }}
106-
run: docker exec -w /root multiarch bash qbt-nox-static.bash -bs-a
110+
run: docker exec -w /root multiarch bash ${script_name} -bs-a
107111

108112
- name: Host - qBittorrent v5 transition ${{ inputs.distinct_id }}
109113
run: |
@@ -118,43 +122,43 @@ jobs:
118122

119123
- name: Docker - zlib-ng ${{ inputs.distinct_id }}
120124
if: env.disable_qt5 != 'yes'
121-
run: docker exec -w /root multiarch bash qbt-nox-static.bash zlib
125+
run: docker exec -w /root multiarch bash ${script_name} zlib
122126

123127
- name: Docker - iconv ${{ inputs.distinct_id }}
124128
if: env.disable_qt5 != 'yes'
125-
run: docker exec -w /root multiarch bash qbt-nox-static.bash iconv
129+
run: docker exec -w /root multiarch bash ${script_name} iconv
126130

127131
- name: Docker - icu ${{ inputs.distinct_id }}
128132
if: env.disable_qt5 != 'yes'
129-
run: docker exec -w /root multiarch bash qbt-nox-static.bash icu
133+
run: docker exec -w /root multiarch bash ${script_name} icu
130134

131135
- name: Docker - openssl ${{ inputs.distinct_id }}
132136
if: env.disable_qt5 != 'yes'
133-
run: docker exec -w /root multiarch bash qbt-nox-static.bash openssl
137+
run: docker exec -w /root multiarch bash ${script_name} openssl
134138

135139
- name: Docker - boost ${{ inputs.distinct_id }}
136140
if: env.disable_qt5 != 'yes'
137-
run: docker exec -w /root multiarch bash qbt-nox-static.bash boost
141+
run: docker exec -w /root multiarch bash ${script_name} boost
138142

139143
- name: Docker - libtorrent ${{ inputs.distinct_id }}
140144
if: env.disable_qt5 != 'yes'
141-
run: docker exec -w /root multiarch bash qbt-nox-static.bash libtorrent
145+
run: docker exec -w /root multiarch bash ${script_name} libtorrent
142146

143147
- name: Docker - double_conversion ${{ inputs.distinct_id }}
144148
if: matrix.qbt_build_tool == '' && env.disable_qt5 != 'yes'
145-
run: docker exec -w /root multiarch bash qbt-nox-static.bash double_conversion
149+
run: docker exec -w /root multiarch bash ${script_name} double_conversion
146150

147151
- name: Docker - qtbase ${{ inputs.distinct_id }}
148152
if: env.disable_qt5 != 'yes'
149-
run: docker exec -w /root multiarch bash qbt-nox-static.bash qtbase
153+
run: docker exec -w /root multiarch bash ${script_name} qtbase
150154

151155
- name: Docker - qttools ${{ inputs.distinct_id }}
152156
if: env.disable_qt5 != 'yes'
153-
run: docker exec -w /root multiarch bash qbt-nox-static.bash qttools
157+
run: docker exec -w /root multiarch bash ${script_name} qttools
154158

155159
- name: Docker - qbittorrent ${{ inputs.distinct_id }}
156160
if: env.disable_qt5 != 'yes'
157-
run: docker exec -w /root multiarch bash qbt-nox-static.bash qbittorrent
161+
run: docker exec -w /root multiarch bash ${script_name} qbittorrent
158162

159163
- name: Docker - Set release asset name ${{ inputs.distinct_id }}
160164
if: env.disable_qt5 != 'yes'

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

Lines changed: 27 additions & 14 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,12 +34,18 @@ jobs:
3034
fail-fast: false
3135
matrix:
3236
container_id: [debian, ubuntu]
33-
container_codename: [bookworm, noble]
37+
container_codename: [bullseye, bookworm, focal, jammy, noble]
3438
qbt_build_tool: ["cmake", "qmake"]
3539
qbt_libtorrent_version: ["1.2", "2.0"]
3640
exclude:
41+
- container_id: debian
42+
container_codename: focal
43+
- container_id: debian
44+
container_codename: jammy
3745
- container_id: debian
3846
container_codename: noble
47+
- container_id: ubuntu
48+
container_codename: bullseye
3949
- container_id: ubuntu
4050
container_codename: bookworm
4151
include:
@@ -45,10 +55,13 @@ jobs:
4555
qbt_qt_version: "6"
4656

4757
name: "${{ matrix.container_id }}-${{ matrix.container_codename }}-${{ matrix.qbt_libtorrent_version }}-qt-${{ matrix.qbt_qt_version }}-${{ matrix.qbt_build_tool }}"
58+
4859
env: # host
4960
qbt_build_dir: "qbt-build"
5061
disable_qt5: ""
5162
artifact_name: "${{ matrix.container_id }}-${{ matrix.container_codename }}-${{ matrix.qbt_libtorrent_version }}-qt-${{ matrix.qbt_qt_version }}-${{ matrix.qbt_build_tool }}-nox"
63+
script_name: ${{ inputs.script_name }}
64+
5265
container:
5366
image: ${{ matrix.container_id }}:${{ matrix.container_codename }}
5467
env: # container
@@ -83,10 +96,10 @@ jobs:
8396
persist-credentials: false
8497

8598
- name: Bootstrap deps ${{ inputs.distinct_id }}
86-
run: bash qbt-nox-static.bash bootstrap_deps
99+
run: bash ${script_name} bootstrap_deps
87100

88101
- name: Bootstrap build ${{ inputs.distinct_id }}
89-
run: bash qbt-nox-static.bash -bs-a
102+
run: bash ${script_name} -bs-a
90103

91104
- name: Host - qBittorrent v5 transition ${{ inputs.distinct_id }}
92105
run: |
@@ -100,47 +113,47 @@ jobs:
100113
101114
- name: glibc ${{ inputs.distinct_id }}
102115
if: env.disable_qt5 != 'yes'
103-
run: bash qbt-nox-static.bash glibc
116+
run: bash ${script_name} glibc
104117

105118
- name: zlib ${{ inputs.distinct_id }}
106119
if: env.disable_qt5 != 'yes'
107-
run: bash qbt-nox-static.bash zlib
120+
run: bash ${script_name} zlib
108121

109122
- name: iconv ${{ inputs.distinct_id }}
110123
if: env.disable_qt5 != 'yes'
111-
run: bash qbt-nox-static.bash iconv
124+
run: bash ${script_name} iconv
112125

113126
- name: icu ${{ inputs.distinct_id }}
114127
if: env.disable_qt5 != 'yes'
115-
run: bash qbt-nox-static.bash icu
128+
run: bash ${script_name} icu
116129

117130
- name: openssl ${{ inputs.distinct_id }}
118131
if: env.disable_qt5 != 'yes'
119-
run: bash qbt-nox-static.bash openssl
132+
run: bash ${script_name} openssl
120133

121134
- name: boost ${{ inputs.distinct_id }}
122135
if: env.disable_qt5 != 'yes'
123-
run: bash qbt-nox-static.bash boost
136+
run: bash ${script_name} boost
124137

125138
- name: libtorrent ${{ inputs.distinct_id }}
126139
if: env.disable_qt5 != 'yes'
127-
run: bash qbt-nox-static.bash libtorrent
140+
run: bash ${script_name} libtorrent
128141

129142
- name: double conversion ${{ inputs.distinct_id }}
130143
if: env.disable_qt5 != 'yes' && matrix.qbt_build_tool == 'cmake'
131-
run: bash qbt-nox-static.bash double_conversion
144+
run: bash ${script_name} double_conversion
132145

133146
- name: qtbase ${{ inputs.distinct_id }}
134147
if: env.disable_qt5 != 'yes'
135-
run: bash qbt-nox-static.bash qtbase
148+
run: bash ${script_name} qtbase
136149

137150
- name: qttools ${{ inputs.distinct_id }}
138151
if: env.disable_qt5 != 'yes'
139-
run: bash qbt-nox-static.bash qttools
152+
run: bash ${script_name} qttools
140153

141154
- name: qbittorrent ${{ inputs.distinct_id }}
142155
if: env.disable_qt5 != 'yes'
143-
run: bash qbt-nox-static.bash qbittorrent
156+
run: bash ${script_name} qbittorrent
144157

145158
- name: Upload ${{ env.artifact_name }} artifacts ${{ inputs.distinct_id }}
146159
if: env.disable_qt5 != 'yes'

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

Lines changed: 8 additions & 0 deletions
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
@@ -66,6 +72,7 @@ jobs:
6672
workflow-files: ${{ github.event.inputs.workflow-files == 'true' && 'yes' || 'no' }}
6773
icu: ${{ github.event.inputs.icu == 'true' && 'no' || 'yes' }}
6874
debug: ${{ github.event.inputs.debug == 'true' && 'yes' || 'no' }}
75+
script_name: ${{ github.event.inputs.script_name }}
6976

7077
ci-alpine-build:
7178
if: always() && github.event.inputs.alpine-build == 'true'
@@ -82,6 +89,7 @@ jobs:
8289
workflow-files: ${{ github.event.inputs.workflow-files == 'true' && 'yes' || 'no' }}
8390
icu: ${{ github.event.inputs.icu == 'true' && 'no' || 'yes' }}
8491
debug: ${{ github.event.inputs.debug == 'true' && 'yes' || 'no' }}
92+
script_name: ${{ github.event.inputs.script_name }}
8593

8694
ci-alpine-release:
8795
needs: [ci-alpine-build]

0 commit comments

Comments
 (0)