Skip to content

Commit 3ee0c09

Browse files
Workflow cleanup
1 parent ea46aa2 commit 3ee0c09

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

.github/workflows/build_deb_rpm.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
{ distribution: ubuntu, codename: noble, description: Ubuntu 24.04 (Noble Numbat), qt_version: '6' },
3737
{ distribution: ubuntu, codename: oracular, description: Ubuntu 24.10 (Oracular Oriole), qt_version: '6' },
3838
{ distribution: ubuntu, codename: plucky, description: Ubuntu 25.04 (Plucky Puffin), qt_version: '6' },
39-
{ distribution: debian, codename: bullseye, description: Debian 11.x (Bullseye), qt_version: '5' }, # Qt 6 only available on amd64, arm64 and armv7
39+
{ distribution: debian, codename: bullseye, description: Debian 11.x (Bullseye), qt_version: '6' },
4040
{ distribution: debian, codename: bookworm, description: Debian 12.x (Bookworm), qt_version: '6' },
4141
{ distribution: debian, codename: trixie, description: Debian 13.x (Trixie), qt_version: '6' },
4242
{ distribution: fedora, codename: 39, description: Fedora 39, qt_version: '6' },
@@ -47,22 +47,13 @@ jobs:
4747
architecture: [
4848
[ amd64, linux/amd64 ],
4949
[ arm64, linux/arm64 ],
50-
[ armhf, linux/arm/v6 ],
51-
[ armhf, linux/arm/v7 ]
50+
[ armhf, linux/arm/v6 ]
5251
]
5352
exclude:
5453
- os: { distribution: ubuntu }
5554
architecture: [ armhf, linux/arm/v6 ]
56-
- os: { distribution: debian, codename: bullseye, }
57-
architecture: [ armhf, linux/arm/v7 ]
58-
- os: { distribution: debian, codename: bookworm, }
59-
architecture: [ armhf, linux/arm/v7 ]
60-
- os: { distribution: debian, codename: trixie, } # Trixie armv6 not available yet (https://hub.docker.com/r/balenalib/rpi-raspbian/tags)
61-
architecture: [ armhf, linux/arm/v6 ]
6255
- os: { distribution: fedora }
6356
architecture: [ armhf, linux/arm/v6 ]
64-
- os: { distribution: fedora }
65-
architecture: [ armhf, linux/arm/v7 ]
6657

6758
steps:
6859
- name: ⬇ Checkout hyperion.ng
@@ -98,7 +89,7 @@ jobs:
9889
distribution: ${{ matrix.os.distribution }}
9990
codename: ${{ matrix.os.codename }}
10091
architecture: ${{ matrix.architecture[0] }}
101-
qtVersion: ${{ matrix.os.qt_version }}
92+
qtVersion: ${{ matrix.os.codename == 'bullseye' && matrix.architecture[0] == 'armhf' && '5' || matrix.os.qt_version }} # Debian Bullseye does not provide Qt6 on armv6
10293
dockerArchitecture: ${{ matrix.architecture[1] }}
10394
dockerEntrypoint: ${{ matrix.architecture[0] != 'amd64' && '--entrypoint /usr/bin/env' || '' }}
10495

0 commit comments

Comments
 (0)