Skip to content

Commit 98254bb

Browse files
committed
remove references to fedora-42 in ci/cd and fix typo in nginx version
1 parent a41583c commit 98254bb

12 files changed

Lines changed: 5 additions & 92 deletions

File tree

.github/workflows/beta.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ jobs:
110110
ubuntu,
111111
debian-bookworm,
112112
debian-trixie,
113-
fedora-42,
114113
fedora-43,
115114
fedora-44,
116115
rhel-8,
@@ -127,8 +126,6 @@ jobs:
127126
package: deb
128127
- linux: debian-trixie
129128
package: deb
130-
- linux: fedora-42
131-
package: rpm
132129
- linux: fedora-43
133130
package: rpm
134131
- linux: fedora-44
@@ -232,7 +229,6 @@ jobs:
232229
ubuntu,
233230
debian-bookworm,
234231
debian-trixie,
235-
fedora-42,
236232
fedora-43,
237233
fedora-44,
238234
el-8,
@@ -259,11 +255,6 @@ jobs:
259255
suffix: ""
260256
version: trixie
261257
package: deb
262-
- linux: fedora-42
263-
separator: "-"
264-
suffix: "1."
265-
version: 42
266-
package: rpm
267258
- linux: fedora-43
268259
separator: "-"
269260
suffix: "1."
@@ -303,9 +294,6 @@ jobs:
303294
- linux: debian-trixie
304295
arch: amd64
305296
package_arch: amd64
306-
- linux: fedora-42
307-
arch: amd64
308-
package_arch: x86_64
309297
- linux: fedora-43
310298
arch: amd64
311299
package_arch: x86_64
@@ -333,9 +321,6 @@ jobs:
333321
- linux: debian-trixie
334322
arch: arm64
335323
package_arch: arm64
336-
- linux: fedora-42
337-
arch: arm64
338-
package_arch: aarch64
339324
- linux: fedora-43
340325
arch: arm64
341326
package_arch: aarch64

.github/workflows/dev.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ jobs:
5353
ubuntu,
5454
debian-bookworm,
5555
debian-trixie,
56-
fedora-42,
5756
fedora-43,
5857
fedora-44,
5958
rhel-8,
@@ -70,8 +69,6 @@ jobs:
7069
package: deb
7170
- linux: debian-trixie
7271
package: deb
73-
- linux: fedora-42
74-
package: rpm
7572
- linux: fedora-43
7673
package: rpm
7774
- linux: fedora-44
@@ -216,7 +213,6 @@ jobs:
216213
ubuntu,
217214
debian-bookworm,
218215
debian-trixie,
219-
fedora-42,
220216
fedora-43,
221217
fedora-44,
222218
el-8,
@@ -246,12 +242,6 @@ jobs:
246242
suffix: ""
247243
version: trixie
248244
package: deb
249-
- linux: fedora-42
250-
package_arch: x86_64
251-
separator: "-"
252-
suffix: "1."
253-
version: 42
254-
package: rpm
255245
- linux: fedora-43
256246
package_arch: x86_64
257247
separator: "-"

.github/workflows/rc.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ jobs:
110110
ubuntu,
111111
debian-bookworm,
112112
debian-trixie,
113-
fedora-42,
114113
fedora-43,
115114
fedora-44,
116115
rhel-8,
@@ -127,8 +126,6 @@ jobs:
127126
package: deb
128127
- linux: debian-trixie
129128
package: deb
130-
- linux: fedora-42
131-
package: rpm
132129
- linux: fedora-43
133130
package: rpm
134131
- linux: fedora-44
@@ -236,7 +233,6 @@ jobs:
236233
ubuntu,
237234
debian-bookworm,
238235
debian-trixie,
239-
fedora-42,
240236
fedora-43,
241237
fedora-44,
242238
el-8,
@@ -263,11 +259,6 @@ jobs:
263259
suffix: ""
264260
version: trixie
265261
package: deb
266-
- linux: fedora-42
267-
separator: "-"
268-
suffix: "1."
269-
version: 42
270-
package: rpm
271262
- linux: fedora-43
272263
separator: "-"
273264
suffix: "1."
@@ -307,9 +298,6 @@ jobs:
307298
- linux: debian-trixie
308299
arch: amd64
309300
package_arch: amd64
310-
- linux: fedora-42
311-
arch: amd64
312-
package_arch: x86_64
313301
- linux: fedora-43
314302
arch: amd64
315303
package_arch: x86_64
@@ -337,9 +325,6 @@ jobs:
337325
- linux: debian-trixie
338326
arch: arm64
339327
package_arch: arm64
340-
- linux: fedora-42
341-
arch: arm64
342-
package_arch: aarch64
343328
- linux: fedora-43
344329
arch: arm64
345330
package_arch: aarch64

.github/workflows/release.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ jobs:
120120
ubuntu,
121121
debian-bookworm,
122122
debian-trixie,
123-
fedora-42,
124123
fedora-43,
125124
fedora-44,
126125
rhel-8,
@@ -137,8 +136,6 @@ jobs:
137136
package: deb
138137
- linux: debian-trixie
139138
package: deb
140-
- linux: fedora-42
141-
package: rpm
142139
- linux: fedora-43
143140
package: rpm
144141
- linux: fedora-44
@@ -242,7 +239,6 @@ jobs:
242239
ubuntu,
243240
debian-bookworm,
244241
debian-trixie,
245-
fedora-42,
246242
fedora-43,
247243
fedora-44,
248244
el-8,
@@ -269,11 +265,6 @@ jobs:
269265
suffix: ""
270266
version: trixie
271267
package: deb
272-
- linux: fedora-42
273-
separator: "-"
274-
suffix: "1."
275-
version: 42
276-
package: rpm
277268
- linux: fedora-43
278269
separator: "-"
279270
suffix: "1."
@@ -313,9 +304,6 @@ jobs:
313304
- linux: debian-trixie
314305
arch: amd64
315306
package_arch: amd64
316-
- linux: fedora-42
317-
arch: amd64
318-
package_arch: x86_64
319307
- linux: fedora-43
320308
arch: amd64
321309
package_arch: x86_64
@@ -343,9 +331,6 @@ jobs:
343331
- linux: debian-trixie
344332
arch: arm64
345333
package_arch: arm64
346-
- linux: fedora-42
347-
arch: arm64
348-
package_arch: aarch64
349334
- linux: fedora-43
350335
arch: arm64
351336
package_arch: aarch64

.github/workflows/staging-tests.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,6 @@ jobs:
8181
- name: Pull BW linux debian Trixie test image
8282
if: inputs.TYPE == 'linux'
8383
run: docker pull ghcr.io/bunkerity/debian-trixie-tests:testing && docker tag ghcr.io/bunkerity/debian-trixie-tests:testing local/debian-trixie:latest
84-
- name: Pull BW linux fedora 42 test image
85-
if: inputs.TYPE == 'linux'
86-
run: docker pull ghcr.io/bunkerity/fedora-42-tests:testing && docker tag ghcr.io/bunkerity/fedora-42-tests:testing local/fedora-42:latest
8784
- name: Pull BW linux fedora 43 test image
8885
if: inputs.TYPE == 'linux'
8986
run: docker pull ghcr.io/bunkerity/fedora-43-tests:testing && docker tag ghcr.io/bunkerity/fedora-43-tests:testing local/fedora-43:latest
@@ -142,12 +139,6 @@ jobs:
142139
env:
143140
TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_LINUX }}
144141
ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }}
145-
- name: Run Linux fedora 42 tests
146-
if: inputs.TYPE == 'linux'
147-
run: export $(echo "$TEST_DOMAINS" | xargs) && chmod +x ./tests/main.py && ./tests/main.py "linux" "fedora-42"
148-
env:
149-
TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_LINUX }}
150-
ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }}
151142
- name: Run Linux fedora 43 tests
152143
if: inputs.TYPE == 'linux'
153144
run: export $(echo "$TEST_DOMAINS" | xargs) && chmod +x ./tests/main.py && ./tests/main.py "linux" "fedora-43"

.github/workflows/staging.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ jobs:
5353
ubuntu,
5454
debian-bookworm,
5555
debian-trixie,
56-
fedora-42,
5756
fedora-43,
5857
fedora-44,
5958
rhel-8,
@@ -68,8 +67,6 @@ jobs:
6867
package: deb
6968
- linux: debian-trixie
7069
package: deb
71-
- linux: fedora-42
72-
package: rpm
7370
- linux: fedora-43
7471
package: rpm
7572
- linux: fedora-44
@@ -189,7 +186,6 @@ jobs:
189186
ubuntu,
190187
debian-bookworm,
191188
debian-trixie,
192-
fedora-42,
193189
fedora-43,
194190
fedora-44,
195191
el-8,
@@ -219,12 +215,6 @@ jobs:
219215
suffix: ""
220216
version: trixie
221217
package: deb
222-
- linux: fedora-42
223-
package_arch: x86_64
224-
separator: "-"
225-
suffix: "1."
226-
version: 42
227-
package: rpm
228218
- linux: fedora-43
229219
package_arch: x86_64
230220
separator: "-"

src/linux/fpm-fedora-42

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/linux/fpm-fedora-43

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--license agpl3
44
--version %VERSION%
55
--architecture %ARCH%
6-
--depends bash --depends 'nginx = 2:1.31.0' --depends 'nginx-mod-stream = 2:1.31.0' --depends python3.12 --depends libcurl-devel --depends libxml2 --depends yajl --depends lmdb-libs --depends geoip-devel --depends gd --depends sudo --depends procps --depends lsof --depends pcre2 --depends libpq --depends libcap --depends openssl --depends logrotate --depends mysql --depends postgresql --depends sqlite3 --depends unzip --depends tar --depends ssdeep-libs --depends curl
6+
--depends bash --depends 'nginx = 2:1.30.1' --depends 'nginx-mod-stream = 2:1.30.1' --depends python3.12 --depends libcurl-devel --depends libxml2 --depends yajl --depends lmdb-libs --depends geoip-devel --depends gd --depends sudo --depends procps --depends lsof --depends pcre2 --depends libpq --depends libcap --depends openssl --depends logrotate --depends mysql --depends postgresql --depends sqlite3 --depends unzip --depends tar --depends ssdeep-libs --depends curl
77
--description "BunkerWeb %VERSION% for Fedora 43"
88
--url "https://www.bunkerweb.io"
99
--maintainer "Bunkerity <contact at bunkerity dot com>"

src/linux/fpm-fedora-44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--license agpl3
44
--version %VERSION%
55
--architecture %ARCH%
6-
--depends bash --depends 'nginx = 2:1.31.0' --depends 'nginx-mod-stream = 2:1.31.0' --depends python3.12 --depends libcurl-devel --depends libxml2 --depends yajl --depends lmdb-libs --depends geoip-devel --depends gd --depends sudo --depends procps --depends lsof --depends pcre2 --depends libpq --depends libcap --depends openssl --depends logrotate --depends mysql --depends postgresql --depends sqlite3 --depends unzip --depends tar --depends ssdeep-libs --depends curl
6+
--depends bash --depends 'nginx = 2:1.30.1' --depends 'nginx-mod-stream = 2:1.30.1' --depends python3.12 --depends libcurl-devel --depends libxml2 --depends yajl --depends lmdb-libs --depends geoip-devel --depends gd --depends sudo --depends procps --depends lsof --depends pcre2 --depends libpq --depends libcap --depends openssl --depends logrotate --depends mysql --depends postgresql --depends sqlite3 --depends unzip --depends tar --depends ssdeep-libs --depends curl
77
--description "BunkerWeb %VERSION% for Fedora 44"
88
--url "https://www.bunkerweb.io"
99
--maintainer "Bunkerity <contact at bunkerity dot com>"

src/linux/fpm-rhel-10

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--license agpl3
44
--version %VERSION%
55
--architecture %ARCH%
6-
--depends bash --depends 'nginx = 2:1.31.0' --depends python3.12 --depends libcurl-devel --depends libxml2 --depends file-libs --depends net-tools --depends gd --depends sudo --depends procps --depends lsof --depends libmaxminddb --depends libpq --depends libcap --depends openssl --depends sqlite --depends unzip --depends tar --depends pcre2 --depends lmdb-libs --depends ssdeep-libs --depends curl
6+
--depends bash --depends 'nginx = 2:1.30.1' --depends python3.12 --depends libcurl-devel --depends libxml2 --depends file-libs --depends net-tools --depends gd --depends sudo --depends procps --depends lsof --depends libmaxminddb --depends libpq --depends libcap --depends openssl --depends sqlite --depends unzip --depends tar --depends pcre2 --depends lmdb-libs --depends ssdeep-libs --depends curl
77
--description "BunkerWeb %VERSION% for RHEL 10"
88
--url "https://www.bunkerweb.io"
99
--maintainer "Bunkerity <contact at bunkerity dot com>"

0 commit comments

Comments
 (0)