From 5f4badcdeb73f9845743ab3dca519077734413ca Mon Sep 17 00:00:00 2001 From: Jonas L Date: Sat, 9 Apr 2022 16:18:12 +0200 Subject: [PATCH] ci: build test images for ubuntu jammy (#1743) --- .github/workflows/tools.yml | 4 +++- analyzer/packages.ini | 12 ++++++------ playout/packages.ini | 10 +++++----- tools/packages.py | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml index 9657424ac..3cf43d0d9 100644 --- a/.github/workflows/tools.yml +++ b/.github/workflows/tools.yml @@ -19,6 +19,8 @@ jobs: release: bionic - distribution: ubuntu release: focal + - distribution: ubuntu + release: jammy - distribution: debian release: buster - distribution: debian @@ -54,7 +56,7 @@ jobs: COPY packages.list packages.list EOF - [[ "${{ matrix.distribution }}" == "ubuntu" ]] && \ + [[ "${{ matrix.release }}" ~= bionic|focal ]] && \ cat <> Dockerfile RUN DEBIAN_FRONTEND=noninteractive apt-get --quiet update && \ DEBIAN_FRONTEND=noninteractive apt-get --quiet install -y software-properties-common && \ diff --git a/analyzer/packages.ini b/analyzer/packages.ini index 9a6075495..95add3b04 100644 --- a/analyzer/packages.ini +++ b/analyzer/packages.ini @@ -1,7 +1,7 @@ # This file contains a list of package dependencies. [python] -python3 = buster, bullseye, bionic, focal -python3-pip = buster, bullseye, bionic, focal +python3 = buster, bullseye, bionic, focal, jammy +python3-pip = buster, bullseye, bionic, focal, jammy [liquidsoap] # https://github.com/savonet/liquidsoap/blob/main/CHANGES.md @@ -20,15 +20,15 @@ liquidsoap-plugin-portaudio = bionic ; liquidsoap-plugin-taglib = bionic ; liquidsoap-plugin-voaacenc = bionic ; liquidsoap-plugin-vorbis = bionic -liquidsoap = buster, bullseye, bionic, focal +liquidsoap = buster, bullseye, bionic, focal, jammy [pika] -python3-pika = buster, bullseye, bionic, focal +python3-pika = buster, bullseye, bionic, focal, jammy [ffmpeg] # Detect duration, silences and replaygain -ffmpeg = buster, bullseye, bionic, focal +ffmpeg = buster, bullseye, bionic, focal, jammy [=development] # Generate fixtures -ffmpeg = buster, bullseye, bionic, focal +ffmpeg = buster, bullseye, bionic, focal, jammy diff --git a/playout/packages.ini b/playout/packages.ini index 855e5ec59..e07f39972 100644 --- a/playout/packages.ini +++ b/playout/packages.ini @@ -1,7 +1,7 @@ # This file contains a list of package dependencies. [python] -python3 = buster, bullseye, bionic, focal -python3-pip = buster, bullseye, bionic, focal +python3 = buster, bullseye, bionic, focal, jammy +python3-pip = buster, bullseye, bionic, focal, jammy [liquidsoap] # https://github.com/savonet/liquidsoap/blob/main/CHANGES.md @@ -20,12 +20,12 @@ liquidsoap-plugin-portaudio = bionic ; liquidsoap-plugin-taglib = bionic ; liquidsoap-plugin-voaacenc = bionic ; liquidsoap-plugin-vorbis = bionic -liquidsoap = buster, bullseye, bionic, focal +liquidsoap = buster, bullseye, bionic, focal, jammy [recorder] -ecasound = buster, bullseye, bionic, focal +ecasound = buster, bullseye, bionic, focal, jammy [misc] # Used by pypofetch to check if a file is open. # TODO: consider using a python library -lsof = buster, bullseye, bionic, focal +lsof = buster, bullseye, bionic, focal, jammy diff --git a/tools/packages.py b/tools/packages.py index 032263f25..e4bf175c9 100755 --- a/tools/packages.py +++ b/tools/packages.py @@ -8,7 +8,7 @@ from typing import Iterator, List, Optional, Set DEFAULT_PACKAGES_FILENAME = "packages.ini" FORMATS = ("list", "line") -DISTRIBUTIONS = ("buster", "bullseye", "bionic", "focal") +DISTRIBUTIONS = ("buster", "bullseye", "bionic", "focal", "jammy") SETTINGS_SECTION = "=settings" DEVELOPMENT_SECTION = "=development"