Skip to content

Commit 3a95782

Browse files
author
Antti Kultanen
committed
Add Ubuntu 26.04 build, drop Ubuntu 22.04 build. Update CI.
1 parent c8fd5d9 commit 3a95782

1 file changed

Lines changed: 19 additions & 11 deletions

File tree

.github/workflows/makefile.yml

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,22 @@ jobs:
157157
zypper -n ref
158158
zypper -n in gcc-c++ make libpcap-devel libtins-devel libnetfilter_log-devel spdlog-devel fmt-devel python3 rpm-build rpmdevtools rpmlint systemd-rpm-macros systemd
159159
160+
- name: Ubuntu 26.04
161+
image: ubuntu:26.04
162+
pkgtype: deb
163+
install: |
164+
ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime
165+
echo "Etc/UTC" > /etc/timezone
166+
apt-get update
167+
apt-get -y --no-install-recommends install ca-certificates libtins-dev libnetfilter-log-dev libspdlog-dev python3 build-essential debhelper-compat lsb-release
160168
- name: Ubuntu 24.04
161169
image: ubuntu:24.04
162170
pkgtype: deb
163-
install: apt-get update && apt-get -y --no-install-recommends install ca-certificates libtins-dev libnetfilter-log-dev libspdlog-dev python3 build-essential debhelper-compat lsb-release
164-
- name: Ubuntu 22.04
165-
image: ubuntu:22.04
166-
pkgtype: deb
167-
install: apt-get update && apt-get -y --no-install-recommends install ca-certificates libtins-dev libnetfilter-log-dev libspdlog-dev python3 build-essential debhelper-compat lsb-release
171+
install: |
172+
ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime
173+
echo "Etc/UTC" > /etc/timezone
174+
apt-get update
175+
apt-get -y --no-install-recommends install ca-certificates libtins-dev libnetfilter-log-dev libspdlog-dev python3 build-essential debhelper-compat lsb-release
168176
169177
runs-on: ubuntu-latest
170178
container:
@@ -243,15 +251,15 @@ jobs:
243251
244252
- name: Verify DEB package installation
245253
if: ${{ matrix.pkgtype == 'deb' }}
246-
run: dpkg -i artifacts/*.deb
254+
run: dpkg -i artifacts/*.*deb
247255

248256
- name: Run the installed binary
249257
if: ${{ matrix.pkgtype == 'deb' }}
250258
run: nflog_dns --version
251259

252260
- name: Verify DEB package re-installation
253261
if: ${{ matrix.pkgtype == 'deb' }}
254-
run: dpkg -i artifacts/*.deb
262+
run: dpkg -i artifacts/*.*deb
255263

256264
- name: Verify DEB package removal
257265
if: ${{ matrix.pkgtype == 'deb' }}
@@ -376,10 +384,10 @@ jobs:
376384
image: debian:13
377385
- name: Debian 12
378386
image: debian:12
387+
- name: Ubuntu 26.04
388+
image: ubuntu:26.04
379389
- name: Ubuntu 24.04
380390
image: ubuntu:24.04
381-
- name: Ubuntu 22.04
382-
image: ubuntu:22.04
383391

384392
runs-on: [ self-hosted, ARM64 ]
385393
container:
@@ -463,13 +471,13 @@ jobs:
463471
Prebuilt installation packages available for:
464472
- AMD64 / x86_64:
465473
- Debian 12, 13
466-
- Ubuntu 22.04, 24.04
474+
- Ubuntu 24.04, 26.04
467475
- Devuan 5.0, 6.0
468476
- Fedora 42, 43
469477
- openSUSE Leap 16.0, Tumbleweed
470478
- ARM64:
471479
- Debian 12, 13
472-
- Ubuntu 22.04, 24.04
480+
- Ubuntu 24.04, 26.04
473481
474482
To verify the download:
475483
sha256sum -c SHA256SUMS.txt

0 commit comments

Comments
 (0)