From 1f3cf859077ec5e6d0e761d25d4b133b30406f0a Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Thu, 2 Apr 2026 13:14:22 +0800 Subject: [PATCH 01/18] Remove old ubuntu versions, add jammy jammy + noble are the most recent LTS releases. Everything else is much older, just drop it. Not even build-tested yet. --- sensible-build.sh | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/sensible-build.sh b/sensible-build.sh index 7945dd0..a461914 100755 --- a/sensible-build.sh +++ b/sensible-build.sh @@ -59,23 +59,11 @@ case $dist in targetdist=trixie extraversion="" ;; - xenial) + jammy) # not tested - debdist=stretch - targetdist=xenial - extraversion="~ubuntu1604+" - ;; - bionic) - # not tested - debdist=buster - targetdist=bionic - extraversion="~ubuntu1804+" - ;; - disco) - # not tested - debdist=buster - targetdist=disco - extraversion="~ubuntu1904+" + debdist=bookworm + targetdist=jammy + extraversion="~ubuntu2204+" ;; noble) # not tested From d42c95b72a2e46ff33f4202d0b316924a8287cc4 Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Thu, 2 Apr 2026 13:54:45 +0800 Subject: [PATCH 02/18] Workflow to test-build piaware on ubuntu 24.04 --- .github/workflows/build.yaml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/build.yaml diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml new file mode 100644 index 0000000..48dfee3 --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,32 @@ +name: Build piaware packages + +on: [ push, pull_request ] + +jobs: + build: + name: Build piaware packages + strategy: + fail-fast: false + matrix: + image: + - ubuntu-24.04 + - ubuntu-24.04-arm + runs-on: ${{ matrix.image }} + steps: + - name: Check out repository + uses: actions/checkout@v6 + - name: Prepare environment vars + run: | + echo "BUILDDIR=${{ runner.temp }}/build" >>$GITHUB_ENV + - name: Prepare build tree + run: | + . /etc/os-release + ./prepare-build.sh $VERSION_CODENAME $BUILDDIR + - name: Install build prerequisites + run: | + sudo apt-get update + sudo apt-get install -y --no-install-recommends devscripts equivs + cd ${{ runner.temp }} && mk-build-deps --tool "apt-get -y --no-install-recommends" --root-cmd sudo --install --remove $BUILDDIR/debian/control + - name: Build package + run: | + cd $BUILDDIR && dpkg-buildpackage -b --no-sign From 0dcf511e48433f7aa6311233409accaf6cd0ea35 Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Thu, 2 Apr 2026 13:56:35 +0800 Subject: [PATCH 03/18] Maybe fix the prepare-build path I can never remember what the cwd is for run .. --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 48dfee3..b61f9dd 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -21,7 +21,7 @@ jobs: - name: Prepare build tree run: | . /etc/os-release - ./prepare-build.sh $VERSION_CODENAME $BUILDDIR + $GITHUB_WORKSPACE/prepare-build.sh $VERSION_CODENAME $BUILDDIR - name: Install build prerequisites run: | sudo apt-get update From 362c67e264918c70ed9cdf062558ee1de71e083e Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Thu, 2 Apr 2026 13:57:07 +0800 Subject: [PATCH 04/18] piaware_builder calls it sensible-build not prepare-build --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b61f9dd..aaa06b7 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -21,7 +21,7 @@ jobs: - name: Prepare build tree run: | . /etc/os-release - $GITHUB_WORKSPACE/prepare-build.sh $VERSION_CODENAME $BUILDDIR + $GITHUB_WORKSPACE/sensible-build.sh $VERSION_CODENAME $BUILDDIR - name: Install build prerequisites run: | sudo apt-get update From a70737c1192e526768fa16cbd3fca781b1ea8bce Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Thu, 2 Apr 2026 13:58:41 +0800 Subject: [PATCH 05/18] sensible-build needs dch from devscripts, so install that earlier --- .github/workflows/build.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index aaa06b7..7d6ed66 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -18,14 +18,16 @@ jobs: - name: Prepare environment vars run: | echo "BUILDDIR=${{ runner.temp }}/build" >>$GITHUB_ENV + - name: Install early build prerequisites + run: | + sudo apt-get update + sudo apt-get install -y --no-install-recommends devscripts equivs - name: Prepare build tree run: | . /etc/os-release $GITHUB_WORKSPACE/sensible-build.sh $VERSION_CODENAME $BUILDDIR - name: Install build prerequisites run: | - sudo apt-get update - sudo apt-get install -y --no-install-recommends devscripts equivs cd ${{ runner.temp }} && mk-build-deps --tool "apt-get -y --no-install-recommends" --root-cmd sudo --install --remove $BUILDDIR/debian/control - name: Build package run: | From e42748fed669ec809b1efc8505e2c1fabff45d6e Mon Sep 17 00:00:00 2001 From: caiusseverus <7763268+caiusseverus@users.noreply.github.com> Date: Fri, 3 Apr 2026 16:39:50 +0100 Subject: [PATCH 06/18] Fix noble wheel packaging globs --- cx_Freeze-8.5.0.patch | 21 +++++++++++++++++++++ freeze-core-0.4.2.patch | 20 ++++++++++++++++++++ trixie/rules | 4 ++-- 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 cx_Freeze-8.5.0.patch create mode 100644 freeze-core-0.4.2.patch diff --git a/cx_Freeze-8.5.0.patch b/cx_Freeze-8.5.0.patch new file mode 100644 index 0000000..025114a --- /dev/null +++ b/cx_Freeze-8.5.0.patch @@ -0,0 +1,21 @@ +diff -ur cx_Freeze-8.5.0/pyproject.toml cx_Freeze-8.5.0.new/pyproject.toml +--- cx_Freeze-8.5.0/pyproject.toml ++++ cx_Freeze-8.5.0.new/pyproject.toml +@@ -49,8 +49,7 @@ + ] + dynamic = ["version"] + keywords = ["cx-freeze cxfreeze cx_Freeze freeze python"] +-license = "PSF-2.0" +-license-files = ["LICENSE.md"] ++license = {text = "PSF-2.0"} + readme = "README.md" + requires-python = ">=3.10" + +@@ -105,6 +104,7 @@ + + [tool.setuptools] + include-package-data = true ++license-files = ["LICENSE.md"] + zip-safe = false + + [tool.setuptools.dynamic] diff --git a/freeze-core-0.4.2.patch b/freeze-core-0.4.2.patch new file mode 100644 index 0000000..44856e3 --- /dev/null +++ b/freeze-core-0.4.2.patch @@ -0,0 +1,20 @@ +diff -ur freeze-core-0.4.2/pyproject.toml freeze-core-0.4.2.new/pyproject.toml +--- freeze-core-0.4.2/pyproject.toml ++++ freeze-core-0.4.2.new/pyproject.toml +@@ -39,8 +39,7 @@ + ] + dynamic = ["version"] + keywords = ["freeze-core freeze cx-freeze cxfreeze cx_Freeze python"] +-license = "MIT" +-license-files = ["LICENSE"] ++license = {text = "MIT"} + readme = "README.md" + requires-python = ">=3.10" + +@@ -68,6 +67,7 @@ + + [tool.setuptools] + include-package-data = true ++license-files = ["LICENSE"] + package-dir = {"" = "src"} + zip-safe = false diff --git a/trixie/rules b/trixie/rules index 53744e8..584be3f 100644 --- a/trixie/rules +++ b/trixie/rules @@ -84,10 +84,10 @@ build_mlat-client: $(VENV)/bin/python -m build --skip-dependency-check --no-isolation --wheel -C="--build-option=--plat-name" -C="--build-option=$(PYTHON_HOST_PLATFORM)" --outdir $(CURDIR)/wheels freeze-core-0.4.2 $(VENV)/bin/python -m pip install --no-index --no-deps --ignore-installed --require-virtualenv $(CURDIR)/wheels/freeze_core-0.4.2*.whl $(VENV)/bin/python -m build --skip-dependency-check --no-isolation --wheel -C="--build-option=--plat-name" -C="--build-option=$(PYTHON_HOST_PLATFORM)" --outdir $(CURDIR)/wheels cx_Freeze-8.5.0 - $(VENV)/bin/python -m pip install --no-index --no-deps --ignore-installed --require-virtualenv $(CURDIR)/wheels/cx_freeze-8.5.0*.whl + $(VENV)/bin/python -m pip install --no-index --no-deps --ignore-installed --require-virtualenv $(CURDIR)/wheels/cx_Freeze-8.5.0-*.whl # build mlat-client proper $(VENV)/bin/python -m build --skip-dependency-check --no-isolation --wheel -C="--build-option=--plat-name" -C="--build-option=$(PYTHON_HOST_PLATFORM)" --outdir $(CURDIR)/wheels mlat-client - $(VENV)/bin/python -m pip install --no-index --no-deps --ignore-installed --require-virtualenv $(CURDIR)/wheels/mlatclient-*.whl + $(VENV)/bin/python -m pip install --no-index --no-deps --ignore-installed --require-virtualenv $(CURDIR)/wheels/MlatClient-*.whl install_mlat-client: # newer cxfreeze deletes --target-dir (see cxfreeze issue #1300), so we have to freeze to a temporary directory and From dd5d56959615600e081a959b0c07887a522afe7d Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Sat, 4 Apr 2026 10:39:37 +0800 Subject: [PATCH 07/18] Enable test builds for jammy (22.04) --- .github/workflows/build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7d6ed66..690f1a4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -9,6 +9,8 @@ jobs: fail-fast: false matrix: image: + - ubuntu-22.04 + - ubuntu-22.04-arm - ubuntu-24.04 - ubuntu-24.04-arm runs-on: ${{ matrix.image }} From 92dcd9bfce013c297c4a5df167706cf78eafaa5e Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Mon, 6 Apr 2026 11:13:19 +0800 Subject: [PATCH 08/18] Try a dumb fix for the trixie-vs-noble wheel capitalization thing --- trixie/rules | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/trixie/rules b/trixie/rules index 7717e2b..d7906d0 100644 --- a/trixie/rules +++ b/trixie/rules @@ -7,6 +7,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/default.mk +# we need nocaseglob +SHELL := /bin/bash + PYTHON3 := /usr/bin/$(shell py3versions -d) VENV=$(CURDIR)/debian/venv @@ -70,10 +73,12 @@ build_mlat-client: $(VENV)/bin/python -m build --skip-dependency-check --no-isolation --wheel --outdir $(CURDIR)/wheels freeze-core-0.4.2 $(VENV)/bin/python -m pip install --no-index --no-deps --ignore-installed --require-virtualenv $(CURDIR)/wheels/freeze_core-0.4.2*.whl $(VENV)/bin/python -m build --skip-dependency-check --no-isolation --wheel --outdir $(CURDIR)/wheels cx_Freeze-8.5.0 - $(VENV)/bin/python -m pip install --no-index --no-deps --ignore-installed --require-virtualenv $(CURDIR)/wheels/cx_freeze-8.5.0*.whl + # nb: trixie and noble produce wheels with different capitalization + shopt -s nocaseglob; $(VENV)/bin/python -m pip install --no-index --no-deps --ignore-installed --require-virtualenv $(CURDIR)/wheels/cx_freeze-8.5.0*.whl # build mlat-client proper $(VENV)/bin/python -m build --skip-dependency-check --no-isolation --wheel --outdir $(CURDIR)/wheels mlat-client - $(VENV)/bin/python -m pip install --no-index --no-deps --ignore-installed --require-virtualenv $(CURDIR)/wheels/mlatclient-*.whl + # nb: trixie and noble produce wheels with different capitalization + shopt -s nocaseglob; $(VENV)/bin/python -m pip install --no-index --no-deps --ignore-installed --require-virtualenv $(CURDIR)/wheels/mlatclient-*.whl install_mlat-client: # newer cxfreeze deletes --target-dir (see cxfreeze issue #1300), so we have to freeze to a temporary directory and From bdd75ebe7ba4e0d7b43caf0e3985d6e1efa66182 Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Mon, 6 Apr 2026 11:15:37 +0800 Subject: [PATCH 09/18] restore noble build in sensible-build --- sensible-build.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sensible-build.sh b/sensible-build.sh index 4cf244f..52149e7 100755 --- a/sensible-build.sh +++ b/sensible-build.sh @@ -65,6 +65,11 @@ case $dist in targetdist=jammy extraversion="~ubuntu2204+" ;; + noble) + debdist=trixie + targetdist=noble + extraversion="~ubuntu2404+" + ;; *) echo "unknown build distribution $1" >&2 usage From c0a818a03aa5b08eb24aa8b41019e31b1f9a1950 Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Mon, 6 Apr 2026 11:17:00 +0800 Subject: [PATCH 10/18] Turn on package resolver debug in mk-build-deps --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 690f1a4..1a4ca67 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -30,7 +30,7 @@ jobs: $GITHUB_WORKSPACE/sensible-build.sh $VERSION_CODENAME $BUILDDIR - name: Install build prerequisites run: | - cd ${{ runner.temp }} && mk-build-deps --tool "apt-get -y --no-install-recommends" --root-cmd sudo --install --remove $BUILDDIR/debian/control + cd ${{ runner.temp }} && mk-build-deps --tool "apt-get -y -o Debug::pkgProblemResolver=yes --no-install-recommends" --root-cmd sudo --install --remove $BUILDDIR/debian/control - name: Build package run: | cd $BUILDDIR && dpkg-buildpackage -b --no-sign From d2e2e4fe5b153e194b1a0a675ba7983e71c99a14 Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Mon, 6 Apr 2026 11:20:23 +0800 Subject: [PATCH 11/18] Try relaxing the bookworm setuptools version constraint This was probably here for a reason, but try relaxing it to see what breaks differently in the jammy build --- bookworm/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookworm/control b/bookworm/control index b92db5c..17b3237 100644 --- a/bookworm/control +++ b/bookworm/control @@ -2,7 +2,7 @@ Source: piaware Section: embedded Priority: extra Maintainer: FlightAware Developers -Build-Depends: debhelper(>=10), tcl8.6-dev, autoconf, python3-dev(>=3.9), python3-venv, python3-setuptools (>=62.6), python3-wheel (>=0.38.4), python3-build, python3-pip, libz-dev, openssl, libboost-system-dev, libboost-program-options-dev, libboost-regex-dev, libboost-filesystem-dev, patchelf +Build-Depends: debhelper(>=10), tcl8.6-dev, autoconf, python3-dev(>=3.9), python3-venv, python3-setuptools, python3-wheel (>=0.38.4), python3-build, python3-pip, libz-dev, openssl, libboost-system-dev, libboost-program-options-dev, libboost-regex-dev, libboost-filesystem-dev, patchelf Standards-Version: 3.9.3 Homepage: https://github.com/flightaware From 0c877838cf12e32df4c66c8adf228c43b489a3ea Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Mon, 6 Apr 2026 11:22:42 +0800 Subject: [PATCH 12/18] Relax wheel constraint too --- bookworm/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookworm/control b/bookworm/control index 17b3237..2903ea7 100644 --- a/bookworm/control +++ b/bookworm/control @@ -2,7 +2,7 @@ Source: piaware Section: embedded Priority: extra Maintainer: FlightAware Developers -Build-Depends: debhelper(>=10), tcl8.6-dev, autoconf, python3-dev(>=3.9), python3-venv, python3-setuptools, python3-wheel (>=0.38.4), python3-build, python3-pip, libz-dev, openssl, libboost-system-dev, libboost-program-options-dev, libboost-regex-dev, libboost-filesystem-dev, patchelf +Build-Depends: debhelper(>=10), tcl8.6-dev, autoconf, python3-dev(>=3.9), python3-venv, python3-setuptools, python3-wheel, python3-build, python3-pip, libz-dev, openssl, libboost-system-dev, libboost-program-options-dev, libboost-regex-dev, libboost-filesystem-dev, patchelf Standards-Version: 3.9.3 Homepage: https://github.com/flightaware From fb141901a941e7f751023888343ff647bba8359b Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Mon, 6 Apr 2026 11:27:33 +0800 Subject: [PATCH 13/18] Revert "Relax wheel constraint too" This reverts commit 0c877838cf12e32df4c66c8adf228c43b489a3ea. --- bookworm/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookworm/control b/bookworm/control index 2903ea7..17b3237 100644 --- a/bookworm/control +++ b/bookworm/control @@ -2,7 +2,7 @@ Source: piaware Section: embedded Priority: extra Maintainer: FlightAware Developers -Build-Depends: debhelper(>=10), tcl8.6-dev, autoconf, python3-dev(>=3.9), python3-venv, python3-setuptools, python3-wheel, python3-build, python3-pip, libz-dev, openssl, libboost-system-dev, libboost-program-options-dev, libboost-regex-dev, libboost-filesystem-dev, patchelf +Build-Depends: debhelper(>=10), tcl8.6-dev, autoconf, python3-dev(>=3.9), python3-venv, python3-setuptools, python3-wheel (>=0.38.4), python3-build, python3-pip, libz-dev, openssl, libboost-system-dev, libboost-program-options-dev, libboost-regex-dev, libboost-filesystem-dev, patchelf Standards-Version: 3.9.3 Homepage: https://github.com/flightaware From 05f75b7a2ed0e758709dacb84968b1dd98f1eca8 Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Mon, 6 Apr 2026 11:27:35 +0800 Subject: [PATCH 14/18] Revert "Try relaxing the bookworm setuptools version constraint" This reverts commit d2e2e4fe5b153e194b1a0a675ba7983e71c99a14. --- bookworm/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookworm/control b/bookworm/control index 17b3237..b92db5c 100644 --- a/bookworm/control +++ b/bookworm/control @@ -2,7 +2,7 @@ Source: piaware Section: embedded Priority: extra Maintainer: FlightAware Developers -Build-Depends: debhelper(>=10), tcl8.6-dev, autoconf, python3-dev(>=3.9), python3-venv, python3-setuptools, python3-wheel (>=0.38.4), python3-build, python3-pip, libz-dev, openssl, libboost-system-dev, libboost-program-options-dev, libboost-regex-dev, libboost-filesystem-dev, patchelf +Build-Depends: debhelper(>=10), tcl8.6-dev, autoconf, python3-dev(>=3.9), python3-venv, python3-setuptools (>=62.6), python3-wheel (>=0.38.4), python3-build, python3-pip, libz-dev, openssl, libboost-system-dev, libboost-program-options-dev, libboost-regex-dev, libboost-filesystem-dev, patchelf Standards-Version: 3.9.3 Homepage: https://github.com/flightaware From e339b886b8dec9aacfd9e78dce75250c070269fc Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Mon, 6 Apr 2026 11:27:47 +0800 Subject: [PATCH 15/18] Revert "Enable test builds for jammy (22.04)" This reverts commit dd5d56959615600e081a959b0c07887a522afe7d. --- .github/workflows/build.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1a4ca67..bd091e8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -9,8 +9,6 @@ jobs: fail-fast: false matrix: image: - - ubuntu-22.04 - - ubuntu-22.04-arm - ubuntu-24.04 - ubuntu-24.04-arm runs-on: ${{ matrix.image }} From 58082b6e719a00e4f8b826e910b2dc9a14ea6bac Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Mon, 6 Apr 2026 11:29:26 +0800 Subject: [PATCH 16/18] jammy is known not to work right now, remove it from sensible-build --- sensible-build.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sensible-build.sh b/sensible-build.sh index 52149e7..ae1e02e 100755 --- a/sensible-build.sh +++ b/sensible-build.sh @@ -59,12 +59,6 @@ case $dist in targetdist=trixie extraversion="" ;; - jammy) - # not tested - debdist=bookworm - targetdist=jammy - extraversion="~ubuntu2204+" - ;; noble) debdist=trixie targetdist=noble From 981159101bc479c45d4f8a135c7c2d4b3055b9dd Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Mon, 6 Apr 2026 11:40:39 +0800 Subject: [PATCH 17/18] Preserve built packages as workflow outputs --- .github/workflows/build.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index bd091e8..f50f175 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -32,3 +32,8 @@ jobs: - name: Build package run: | cd $BUILDDIR && dpkg-buildpackage -b --no-sign + - name: Upload artifacts + uses: actions/upload-artifact@v6 + with: + name: piaware-${{ matrix.image }} + path: ${{ runner.temp }}/*.deb From ae8a7b4141de9590bf396fba588e4b6eb090e903 Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Mon, 6 Apr 2026 19:12:44 +0800 Subject: [PATCH 18/18] Build for 22.04 (jammy) based on bullseye jammy was actually based on debian at around the time of the bullseye release, not bookworm. This works much better. --- .github/workflows/build.yaml | 2 ++ sensible-build.sh | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f50f175..85132a6 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -9,6 +9,8 @@ jobs: fail-fast: false matrix: image: + - ubuntu-22.04 + - ubuntu-22.04-arm - ubuntu-24.04 - ubuntu-24.04-arm runs-on: ${{ matrix.image }} diff --git a/sensible-build.sh b/sensible-build.sh index ae1e02e..d707969 100755 --- a/sensible-build.sh +++ b/sensible-build.sh @@ -59,6 +59,11 @@ case $dist in targetdist=trixie extraversion="" ;; + jammy) + debdist=bullseye + targetdist=jammy + extraversion="~ubuntu2204+" + ;; noble) debdist=trixie targetdist=noble