Skip to content

Commit cc9be5e

Browse files
committed
Update release.yml
1 parent e83b197 commit cc9be5e

1 file changed

Lines changed: 80 additions & 17 deletions

File tree

.github/workflows/release.yml

Lines changed: 80 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,28 @@ jobs:
5757
distr:
5858
- name: trixie
5959
version: 13
60-
extra_pack: ""
60+
artifact: "Qt5"
61+
extra_pack: "qtwebengine5-dev"
62+
flags: "-w webengine"
63+
- name: trixie
64+
version: 13
65+
artifact: "Qt6"
66+
extra_pack: "qt6-webengine-dev qt6-5compat-dev"
67+
flags: "-q qmake6 -w webengine"
6168
- name: bookworm
6269
version: 12
63-
extra_pack: ""
70+
artifact: "Qt5"
71+
extra_pack: "libqt5webkit5-dev"
72+
flags: ""
6473
- name: bullseye
6574
version: 11
66-
extra_pack: ""
67-
- name: buster
68-
version: 10
69-
extra_pack: "qt5-default"
75+
artifact: "Qt5"
76+
extra_pack: "libqt5webkit5-dev"
77+
flags: ""
78+
#- name: buster
79+
# version: 10
80+
# extra_pack: "qt5-default qtbase5-dev libqt5webkit5-dev"
81+
# flags: ""
7082
arch:
7183
- name: amd64
7284
id: linux/amd64
@@ -81,15 +93,15 @@ jobs:
8193
run: |
8294
apt-get update
8395
# https://serverfault.com/a/992421
84-
DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y build-essential qtbase5-dev libqt5webkit5-dev gettext libzip-dev libchm-dev ${{matrix.distr.extra_pack}}
96+
DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y build-essential gettext libzip-dev libchm-dev ${{matrix.distr.extra_pack}}
8597
8698
- name: Build
87-
run: packages/build-deb.sh -s debian-${{matrix.distr.name}} -v ${{ needs.setup.outputs.version }}
99+
run: packages/build-deb.sh ${{matrix.distr.flags}} -s debian-${{matrix.distr.name}} -v ${{ needs.setup.outputs.version }}
88100

89101
- name: Upload debian packages
90102
uses: actions/upload-artifact@v4
91103
with:
92-
name: debian-${{matrix.distr.name}}-${{matrix.arch.name}}
104+
name: debian-${{matrix.distr.name}}-${{matrix.distr.artifact}}-${{matrix.arch.name}}
93105
path: '*.deb'
94106

95107
# https://en.wikipedia.org/wiki/Ubuntu_version_history
@@ -103,13 +115,19 @@ jobs:
103115
distr:
104116
- name: noble
105117
version: 24.04
106-
extra_pack: ""
118+
artifact: "Qt5"
119+
extra_pack: "libqt5webkit5-dev"
120+
flags: ""
107121
- name: jammy
108122
version: 22.04
109-
extra_pack: ""
123+
artifact: "Qt5"
124+
extra_pack: "libqt5webkit5-dev"
125+
flags: ""
110126
- name: focal
111127
version: 20.04
112-
extra_pack: "qt5-default"
128+
artifact: "Qt5"
129+
extra_pack: "qt5-default libqt5webkit5-dev"
130+
flags: ""
113131
arch:
114132
- name: amd64
115133
id: linux/amd64
@@ -123,17 +141,61 @@ jobs:
123141
- name: Install Dependencies
124142
run: |
125143
apt-get update
126-
DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y build-essential qtbase5-dev libqt5webkit5-dev gettext libzip-dev libchm-dev ${{matrix.distr.extra_pack}}
144+
DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y build-essential gettext libzip-dev libchm-dev ${{matrix.distr.extra_pack}}
127145
128146
- name: Build
129-
run: packages/build-deb.sh -s ubuntu-${{matrix.distr.name}} -v ${{ needs.setup.outputs.version }}
147+
run: packages/build-deb.sh ${{matrix.distr.flags}} -s ubuntu-${{matrix.distr.name}} -v ${{ needs.setup.outputs.version }}
130148

131149
- name: Upload ubuntu packages
132150
uses: actions/upload-artifact@v4
133151
with:
134-
name: ubuntu-${{matrix.distr.name}}-${{matrix.arch.name}}
152+
name: ubuntu-${{matrix.distr.name}}-${{matrix.distr.artifact}}-${{matrix.arch.name}}
135153
path: '*.deb'
136154

155+
# https://en.wikipedia.org/wiki/Fedora_Linux_release_history
156+
# https://hub.docker.com/_/fedora
157+
build-fedora-packages:
158+
runs-on: ubuntu-22.04
159+
needs: setup
160+
strategy:
161+
fail-fast: false
162+
matrix:
163+
distr:
164+
- version: 43
165+
artifact: "Qt5"
166+
extra_pack: "qt5-qtwebkit-devel"
167+
flags: "-q qmake-qt5"
168+
- version: 42
169+
artifact: "Qt5"
170+
extra_pack: "qt5-qtwebkit-devel"
171+
flags: "-q qmake-qt5"
172+
- version: 41
173+
artifact: "Qt5"
174+
extra_pack: "qt5-qtwebkit-devel"
175+
flags: "-q qmake-qt5"
176+
arch:
177+
- name: amd64
178+
id: linux/amd64
179+
container:
180+
image: fedora:${{matrix.distr.version}}
181+
options: --platform ${{matrix.arch.id}}
182+
steps:
183+
- name: Checkout repository
184+
uses: actions/checkout@v4
185+
186+
- name: Install Dependencies
187+
run: |
188+
dnf install -q -y coreutils gcc make cmake git gettext libzip-devel chmlib-devel rpm-build ${{matrix.distr.extra_pack}}
189+
190+
- name: Build
191+
run: packages/build-rpm.sh ${{matrix.distr.flags}} -s fedora-${{matrix.distr.version}} -v ${{ needs.setup.outputs.version }}
192+
193+
- name: Upload fedora packages
194+
uses: actions/upload-artifact@v4
195+
with:
196+
name: fedora-${{matrix.distr.version}}-${{matrix.distr.artifact}}-${{matrix.arch.name}}
197+
path: '*.rpm'
198+
137199
build-windows-installer:
138200
runs-on: windows-2025
139201
needs: setup
@@ -142,7 +204,6 @@ jobs:
142204
matrix:
143205
msystem:
144206
- mingw64
145-
- mingw32
146207
defaults:
147208
run:
148209
shell: msys2 {0}
@@ -176,6 +237,8 @@ jobs:
176237
qt5-base:p
177238
qt5-translations:p
178239
qtwebkit:p
240+
gettext-runtime:p
241+
gettext-tools:p
179242
180243
- name: Build
181244
run: packages/build-win-msys2.sh -s windows -v ${{ needs.setup.outputs.version }}
@@ -190,7 +253,7 @@ jobs:
190253
191254
create-release:
192255
runs-on: ubuntu-22.04
193-
needs: [build-debian-packages, build-ubuntu-packages, build-windows-installer]
256+
needs: [build-debian-packages, build-ubuntu-packages, build-fedora-packages, build-windows-installer]
194257
steps:
195258
- name: Download build artifacts
196259
uses: actions/download-artifact@v4

0 commit comments

Comments
 (0)