Skip to content

Commit 6ca090d

Browse files
CalcProgrammer1CalcProgrammer1
committed
Use Bullseye OpenRGB builder image to build AppImages and Debian Bullseye .deb packages
1 parent 57e7e6a commit 6ca090d

File tree

1 file changed

+75
-130
lines changed

1 file changed

+75
-130
lines changed

‎.gitlab-ci.yml‎

Lines changed: 75 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ before_script:
3232
#-----------------------------------------------------------------------#
3333
"Linux 32 AppImage":
3434
<<: *ccache_init
35-
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:buster-32
35+
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bullseye-32
3636
stage: build
3737
script:
3838
- export $(dpkg-architecture)
@@ -51,7 +51,7 @@ before_script:
5151
#-----------------------------------------------------------------------#
5252
"Linux 64 AppImage":
5353
<<: *ccache_init
54-
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:buster-64
54+
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bullseye-64
5555
stage: build
5656
script:
5757
- export $(dpkg-architecture)
@@ -66,9 +66,9 @@ before_script:
6666
expire_in: 30 days
6767

6868
#-----------------------------------------------------------------------#
69-
# Linux (.deb) 32-bit Build Target #
69+
# Linux (.deb) Debian Buster (Legacy) 32-bit Build Target #
7070
#-----------------------------------------------------------------------#
71-
"Linux 32 deb":
71+
"Linux 32 .deb (Debian Buster)":
7272
<<: *ccache_init
7373
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:buster-32
7474
stage: build
@@ -87,9 +87,9 @@ before_script:
8787
expire_in: 30 days
8888

8989
#-----------------------------------------------------------------------#
90-
# Linux (.deb) 64-bit Build Target #
90+
# Linux (.deb) Debian Buster (Legacy) 64-bit Build Target #
9191
#-----------------------------------------------------------------------#
92-
"Linux 64 deb":
92+
"Linux 64 .deb (Debian Buster)":
9393
<<: *ccache_init
9494
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:buster-64
9595
stage: build
@@ -107,43 +107,14 @@ before_script:
107107
- openrgb-dbgsym*.deb
108108
expire_in: 30 days
109109

110-
#-----------------------------------------------------------------------#
111-
# Linux (.rpm) 64-bit Build Target #
112-
#-----------------------------------------------------------------------#
113-
"Linux 64 rpm":
114-
image: fedora:34
115-
stage: build
116-
script:
117-
- dnf install rpmdevtools dnf-plugins-core -y
118-
- rpmdev-setuptree
119-
- ls /root/
120-
- cp fedora/OpenRGB.spec /root/rpmbuild/SPECS
121-
- cp ../OpenRGB /root/rpmbuild/SOURCES/ -r
122-
- cd /root/rpmbuild/SOURCES
123-
- tar -cf OpenRGB.tar.gz OpenRGB/
124-
- cd ..
125-
- dnf builddep SPECS/OpenRGB.spec -y
126-
- rpmbuild -ba SPECS/OpenRGB.spec
127-
- cd RPMS/x86_64/
128-
- mv openrgb*.rpm ${CI_PROJECT_DIR}/
129-
- cd ${CI_PROJECT_DIR}
130-
131-
artifacts:
132-
name: "${CI_PROJECT_NAME}_Linux_64_rpm_${CI_COMMIT_SHORT_SHA}"
133-
paths:
134-
- openrgb*.rpm
135-
expire_in: 30 days
136-
137110
#-----------------------------------------------------------------------#
138111
# Linux (.deb) Debian Bullseye 32-bit Build Target #
139112
#-----------------------------------------------------------------------#
140-
"Linux 32 deb Bullseye":
113+
"Linux 32 .deb (Debian Bullseye)":
141114
<<: *ccache_init
142-
image: i386/debian:bullseye
115+
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bullseye-32
143116
stage: build
144117
script:
145-
- apt update
146-
- apt install -y build-essential qtcreator qtbase5-dev libusb-1.0-0-dev libhidapi-dev libmbedtls-dev pkgconf wget git file debhelper
147118
- dpkg-architecture -l
148119
- dpkg-buildpackage --target-arch i386 -us -B
149120
- rm -v ../openrgb-dbgsym*.deb
@@ -156,17 +127,15 @@ before_script:
156127
exclude:
157128
- openrgb-dbgsym*.deb
158129
expire_in: 30 days
159-
130+
160131
#-----------------------------------------------------------------------#
161132
# Linux (.deb) Debian Bullseye 64-bit Build Target #
162133
#-----------------------------------------------------------------------#
163-
"Linux 64 deb Bullseye":
134+
"Linux 64 .deb (Debian Bullseye)":
164135
<<: *ccache_init
165-
image: debian:bullseye
136+
image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bullseye-64
166137
stage: build
167138
script:
168-
- apt update
169-
- apt install -y build-essential qtcreator qtbase5-dev libusb-1.0-0-dev libhidapi-dev libmbedtls-dev pkgconf wget git file debhelper
170139
- dpkg-architecture -l
171140
- dpkg-buildpackage -us -B
172141
- rm -v ../openrgb-dbgsym*.deb
@@ -180,6 +149,33 @@ before_script:
180149
- openrgb-dbgsym*.deb
181150
expire_in: 30 days
182151

152+
#-----------------------------------------------------------------------#
153+
# Linux (.rpm) 64-bit Build Target #
154+
#-----------------------------------------------------------------------#
155+
"Linux 64 rpm":
156+
image: fedora:34
157+
stage: build
158+
script:
159+
- dnf install rpmdevtools dnf-plugins-core -y
160+
- rpmdev-setuptree
161+
- ls /root/
162+
- cp fedora/OpenRGB.spec /root/rpmbuild/SPECS
163+
- cp ../OpenRGB /root/rpmbuild/SOURCES/ -r
164+
- cd /root/rpmbuild/SOURCES
165+
- tar -cf OpenRGB.tar.gz OpenRGB/
166+
- cd ..
167+
- dnf builddep SPECS/OpenRGB.spec -y
168+
- rpmbuild -ba SPECS/OpenRGB.spec
169+
- cd RPMS/x86_64/
170+
- mv openrgb*.rpm ${CI_PROJECT_DIR}/
171+
- cd ${CI_PROJECT_DIR}
172+
173+
artifacts:
174+
name: "${CI_PROJECT_NAME}_Linux_64_rpm_${CI_COMMIT_SHORT_SHA}"
175+
paths:
176+
- openrgb*.rpm
177+
expire_in: 30 days
178+
183179
#-----------------------------------------------------------------------#
184180
# Debian 32 Buster test #
185181
#-----------------------------------------------------------------------#
@@ -193,83 +189,49 @@ before_script:
193189
- openrgb -l
194190
- apt remove -y openrgb
195191
dependencies:
196-
- "Linux 32 deb"
192+
- "Linux 32 .deb (Debian Buster)"
197193
needs:
198-
- "Linux 32 deb"
194+
- "Linux 32 .deb (Debian Buster)"
199195

200196
#-----------------------------------------------------------------------#
201-
# Debian 32 Bullseye test #
197+
# Debian 64 Buster test #
202198
#-----------------------------------------------------------------------#
203-
"Debian 32 Bullseye":
204-
image: i386/debian:bullseye
199+
"Debian 64 Buster":
200+
image: amd64/debian:buster
205201
stage: test
206202
script:
207203
- apt update
208-
- DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*i386.deb
204+
- DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*amd64.deb
209205
- openrgb --version
210206
- openrgb -l
211207
- apt remove -y openrgb
212208
dependencies:
213-
- "Linux 32 deb"
209+
- "Linux 64 .deb (Debian Buster)"
214210
needs:
215-
- "Linux 32 deb"
216-
217-
# #-----------------------------------------------------------------------#
218-
# # Ubuntu 32 18.04LTS test #
219-
# #-----------------------------------------------------------------------#
220-
# "Ubuntu 32 18.04LTS":
221-
# image: i386/ubuntu:bionic
222-
# stage: test
223-
# script:
224-
# - apt update
225-
# - DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*i386.deb
226-
# - openrgb --version
227-
# - openrgb -l
228-
# - apt remove -y openrgb
229-
# dependencies:
230-
# - "Linux 32 deb"
231-
# needs:
232-
# - "Linux 32 deb"
233-
234-
# #-----------------------------------------------------------------------#
235-
# # Mint 32 19.3 test #
236-
# #-----------------------------------------------------------------------#
237-
# "Mint 32 20.1":
238-
# image: linuxmintd/mint19.3-i386
239-
# stage: test
240-
# script:
241-
# - apt update
242-
# - DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*i386.deb
243-
# - openrgb --version
244-
# - openrgb -l
245-
# - apt remove -y openrgb
246-
# dependencies:
247-
# - "Linux 32 deb"
248-
# needs:
249-
# - "Linux 32 deb"
211+
- "Linux 64 .deb (Debian Buster)"
250212

251213
#-----------------------------------------------------------------------#
252-
# Debian 64 Buster test #
214+
# Debian 32 Bullseye test #
253215
#-----------------------------------------------------------------------#
254-
"Debian 64 Buster":
255-
image: debian:buster
216+
"Debian 32 Bullseye":
217+
image: i386/debian:bullseye
256218
stage: test
257219
script:
258220
- apt update
259-
- DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*amd64.deb
221+
- DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*i386.deb
260222
- openrgb --version
261223
- openrgb -l
262224
- apt remove -y openrgb
263225
dependencies:
264-
- "Linux 64 deb"
226+
- "Linux 32 .deb (Debian Bullseye)"
265227
needs:
266-
- "Linux 64 deb"
228+
- "Linux 32 .deb (Debian Bullseye)"
267229

268230
#-----------------------------------------------------------------------#
269231
# Debian 64 Bullseye test #
270232
#-----------------------------------------------------------------------#
271233
"Debian 64 Bullseye":
272-
image: debian:bullseye
234+
image: amd64/debian:bullseye
273235
stage: test
274236
script:
275237
- apt update
@@ -278,48 +240,32 @@ before_script:
278240
- openrgb -l
279241
- apt remove -y openrgb
280242
dependencies:
281-
- "Linux 64 deb"
243+
- "Linux 64 .deb (Debian Bullseye)"
282244
needs:
283-
- "Linux 64 deb"
245+
- "Linux 64 .deb (Debian Bullseye)"
284246

285247
#-----------------------------------------------------------------------#
286-
# Fedora 64 v34 test #
248+
# Ubuntu 64 20.04LTS test #
287249
#-----------------------------------------------------------------------#
288-
"Fedora 64 v34":
289-
image: fedora:34
250+
"Ubuntu 64 20.04LTS":
251+
image: ubuntu:focal
290252
stage: test
291253
script:
292-
- yum -y localinstall ./openrgb*64.rpm
254+
- apt update
255+
- DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*amd64.deb
293256
- openrgb --version
294257
- openrgb -l
295-
- yum -y remove openrgb
258+
- apt remove -y openrgb
296259
dependencies:
297-
- "Linux 64 rpm"
260+
- "Linux 64 .deb (Debian Buster)"
298261
needs:
299-
- "Linux 64 rpm"
300-
301-
# #-----------------------------------------------------------------------#
302-
# # Ubuntu 64 18.04LTS test #
303-
# #-----------------------------------------------------------------------#
304-
# "Ubuntu 64 18.04LTS":
305-
# image: ubuntu:bionic
306-
# stage: test
307-
# script:
308-
# - apt update
309-
# - DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*amd64.deb
310-
# - openrgb --version
311-
# - openrgb -l
312-
# - apt remove -y openrgb
313-
# dependencies:
314-
# - "Linux 64 deb"
315-
# needs:
316-
# - "Linux 64 deb"
262+
- "Linux 64 .deb (Debian Buster)"
317263

318264
#-----------------------------------------------------------------------#
319-
# Ubuntu 64 20.04LTS test #
265+
# Ubuntu 64 21.10 test #
320266
#-----------------------------------------------------------------------#
321-
"Ubuntu 64 20.04LTS":
322-
image: ubuntu:focal
267+
"Ubuntu 64 21.10":
268+
image: ubuntu:impish
323269
stage: test
324270
script:
325271
- apt update
@@ -328,26 +274,25 @@ before_script:
328274
- openrgb -l
329275
- apt remove -y openrgb
330276
dependencies:
331-
- "Linux 64 deb"
277+
- "Linux 64 .deb (Debian Bullseye)"
332278
needs:
333-
- "Linux 64 deb"
279+
- "Linux 64 .deb (Debian Bullseye)"
334280

335281
#-----------------------------------------------------------------------#
336-
# Mint 64 20.1 test #
282+
# Fedora 64 v34 test #
337283
#-----------------------------------------------------------------------#
338-
"Mint 64 20.1":
339-
image: linuxmintd/mint20.1-amd64
284+
"Fedora 64 v34":
285+
image: fedora:34
340286
stage: test
341287
script:
342-
- apt update
343-
- DEBIAN_FRONTEND=noninteractive apt install -yq --no-install-recommends ./openrgb*amd64.deb
288+
- yum -y localinstall ./openrgb*64.rpm
344289
- openrgb --version
345290
- openrgb -l
346-
- apt remove -y openrgb
291+
- yum -y remove openrgb
347292
dependencies:
348-
- "Linux 64 deb"
293+
- "Linux 64 rpm"
349294
needs:
350-
- "Linux 64 deb"
295+
- "Linux 64 rpm"
351296

352297
#-----------------------------------------------------------------------#
353298
# Windows (32-bit) Build Target #

0 commit comments

Comments
 (0)