diff --git a/.github/workflows/_python.yml b/.github/workflows/_python.yml index 2f7118036..05efcaf9e 100644 --- a/.github/workflows/_python.yml +++ b/.github/workflows/_python.yml @@ -51,8 +51,8 @@ jobs: fail-fast: false matrix: release: - - bullseye - focal + - bullseye - jammy container: diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml index 9aa2d640d..1bd9c2e50 100644 --- a/.github/workflows/api.yml +++ b/.github/workflows/api.yml @@ -30,8 +30,8 @@ jobs: fail-fast: false matrix: release: - - bullseye - focal + - bullseye - jammy services: diff --git a/.github/workflows/dev-tools.yml b/.github/workflows/dev-tools.yml index 44d286ed2..cd5a09fcb 100644 --- a/.github/workflows/dev-tools.yml +++ b/.github/workflows/dev-tools.yml @@ -17,10 +17,10 @@ jobs: include: - distribution: ubuntu release: focal - - distribution: ubuntu - release: jammy - distribution: debian release: bullseye + - distribution: ubuntu + release: jammy - distribution: debian release: bookworm diff --git a/.github/workflows/legacy.yml b/.github/workflows/legacy.yml index c08ec4bdc..24438a311 100644 --- a/.github/workflows/legacy.yml +++ b/.github/workflows/legacy.yml @@ -26,7 +26,7 @@ jobs: fail-fast: false matrix: include: - - php-version: "7.4" # Bullseye, Focal + - php-version: "7.4" # Focal, Bullseye steps: - uses: actions/checkout@v3 @@ -44,7 +44,7 @@ jobs: fail-fast: false matrix: include: - - php-version: "7.4" # Bullseye, Focal + - php-version: "7.4" # Focal, Bullseye env: ENVIRONMENT: testing diff --git a/analyzer/packages.ini b/analyzer/packages.ini index c2c85aeb9..08f27ec39 100644 --- a/analyzer/packages.ini +++ b/analyzer/packages.ini @@ -1,17 +1,17 @@ # This file contains a list of package dependencies. [python] -python3 = bullseye, bookworm, focal, jammy -python3-pip = bullseye, bookworm, focal, jammy -python3-pika = bullseye, bookworm, focal, jammy +python3 = focal, bullseye, jammy, bookworm +python3-pip = focal, bullseye, jammy, bookworm +python3-pika = focal, bullseye, jammy, bookworm [liquidsoap] # https://github.com/savonet/liquidsoap/blob/main/CHANGES.md -liquidsoap = bullseye, bookworm, focal, jammy +liquidsoap = focal, bullseye, jammy, bookworm [ffmpeg] # Detect duration, silences and replaygain -ffmpeg = bullseye, bookworm, focal, jammy +ffmpeg = focal, bullseye, jammy, bookworm [=development] # Generate fixtures -ffmpeg = bullseye, bookworm, focal, jammy +ffmpeg = focal, bullseye, jammy, bookworm diff --git a/analyzer/tests/pipeline/analyze_playability_test.py b/analyzer/tests/pipeline/analyze_playability_test.py index edfe570b1..55b105c91 100644 --- a/analyzer/tests/pipeline/analyze_playability_test.py +++ b/analyzer/tests/pipeline/analyze_playability_test.py @@ -33,8 +33,8 @@ def test_analyze_playability_invalid_filepath(): def test_analyze_playability_invalid_wma(): - # Liquisoap does not fail with wma files on bullseye, focal, jammy - if distro.codename() in ("bullseye", "focal", "jammy"): + # Liquisoap does not fail with wma files on focal, bullseye, jammy + if distro.codename() in ("focal", "bullseye", "jammy"): return with pytest.raises(UnplayableFileError): diff --git a/api/packages.ini b/api/packages.ini index 07b8c9b9a..bda6be438 100644 --- a/api/packages.ini +++ b/api/packages.ini @@ -1,15 +1,15 @@ # This file contains a list of package dependencies. [python] -python3 = bullseye, focal -python3-pip = bullseye, focal -gunicorn = bullseye, focal -python3-gunicorn = bullseye, focal -python3-uvicorn = bullseye, focal -python3-httptools = bullseye, focal -python3-uvloop = bullseye, focal +python3 = focal, bullseye +python3-pip = focal, bullseye +gunicorn = focal, bullseye +python3-gunicorn = focal, bullseye +python3-uvicorn = focal, bullseye +python3-httptools = focal, bullseye +python3-uvloop = focal, bullseye [psycopg2] # See https://www.psycopg.org/docs/install.html#install-from-source -build-essential = bullseye, focal -python3-dev = bullseye, focal -libpq-dev = bullseye, focal +build-essential = focal, bullseye +python3-dev = focal, bullseye +libpq-dev = focal, bullseye diff --git a/docs/developer-manual/development/environment.md b/docs/developer-manual/development/environment.md index 10393a838..d1f91df34 100644 --- a/docs/developer-manual/development/environment.md +++ b/docs/developer-manual/development/environment.md @@ -104,8 +104,8 @@ offers the option to choose a different operation system according to you needs. | OS | Command | Comment | | ------------ | --------------------- | ------------------------------ | -| Debian 11 | `vagrant up bullseye` | Install on Debian Bullseye. | | Ubuntu 20.04 | `vagrant up focal` | Install on Ubuntu Focal Fossa. | +| Debian 11 | `vagrant up bullseye` | Install on Debian Bullseye. | ### Troubleshooting diff --git a/install b/install index 6384f193e..a59756066 100755 --- a/install +++ b/install @@ -305,8 +305,8 @@ check_distribution() { # shellcheck disable=SC2034 case "$ID-$VERSION_ID" in - debian-11) is_debian=true && distro="bullseye" ;; ubuntu-20.04) is_ubuntu=true && distro="focal" ;; + debian-11) is_debian=true && distro="bullseye" ;; *) error << "EOF" could not determine supported distribution "$ID-$VERSION_ID"! diff --git a/legacy/packages.ini b/legacy/packages.ini index 90dd266df..16a87ff54 100644 --- a/legacy/packages.ini +++ b/legacy/packages.ini @@ -2,31 +2,31 @@ [common] # The php-pear package depends on php-(cli|common|xml), be sure to # install the dependencies with the right php version. -php-pear = bullseye, focal -php-amqplib = bullseye, focal +php-pear = focal, bullseye +php-amqplib = focal, bullseye [locale] -gettext = bullseye, focal +gettext = focal, bullseye # [apache] -# apache2 = bullseye, focal -# libapache2-mod-php7.4 = bullseye, focal +# apache2 = focal, bullseye +# libapache2-mod-php7.4 = focal, bullseye [php-fpm] -php7.4-fpm = bullseye, focal +php7.4-fpm = focal, bullseye -# Bullseye, Focal +# Focal, Bullseye [php7.4] -php7.4 = bullseye, focal -php7.4-apcu = bullseye, focal -php7.4-apcu-bc = bullseye, focal -php7.4-bcmath = bullseye, focal -php7.4-cli = bullseye, focal -php7.4-common = bullseye, focal -php7.4-curl = bullseye, focal -php7.4-dev = bullseye, focal -php7.4-gd = bullseye, focal -php7.4-mbstring = bullseye, focal -php7.4-pgsql = bullseye, focal -php7.4-xml = bullseye, focal -php7.4-yaml = bullseye, focal +php7.4 = focal, bullseye +php7.4-apcu = focal, bullseye +php7.4-apcu-bc = focal, bullseye +php7.4-bcmath = focal, bullseye +php7.4-cli = focal, bullseye +php7.4-common = focal, bullseye +php7.4-curl = focal, bullseye +php7.4-dev = focal, bullseye +php7.4-gd = focal, bullseye +php7.4-mbstring = focal, bullseye +php7.4-pgsql = focal, bullseye +php7.4-xml = focal, bullseye +php7.4-yaml = focal, bullseye diff --git a/playout/packages.ini b/playout/packages.ini index 732d0a5d8..c092eea88 100644 --- a/playout/packages.ini +++ b/playout/packages.ini @@ -1,17 +1,17 @@ # This file contains a list of package dependencies. [python] -python3 = bullseye, bookworm, focal, jammy -python3-pip = bullseye, bookworm, focal, jammy -python3-lxml = bullseye, bookworm, focal, jammy +python3 = focal, bullseye, jammy, bookworm +python3-pip = focal, bullseye, jammy, bookworm +python3-lxml = focal, bullseye, jammy, bookworm [liquidsoap] # https://github.com/savonet/liquidsoap/blob/main/CHANGES.md -liquidsoap = bullseye, bookworm, focal, jammy +liquidsoap = focal, bullseye, jammy, bookworm [recorder] -ecasound = bullseye, bookworm, focal, jammy +ecasound = focal, bullseye, jammy, bookworm [misc] # Used by pypofetch to check if a file is open. # TODO: consider using a python library -lsof = bullseye, bookworm, focal, jammy +lsof = focal, bullseye, jammy, bookworm diff --git a/shared/packages.ini b/shared/packages.ini index 8a8f70f61..c02617359 100644 --- a/shared/packages.ini +++ b/shared/packages.ini @@ -1,3 +1,3 @@ # This file contains a list of package dependencies. [tzdata] -tzdata = bullseye, bookworm, focal, jammy +tzdata = focal, bullseye, jammy, bookworm diff --git a/tools/packages.py b/tools/packages.py index b4e908658..f2de3fa81 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 = ("bullseye", "bookworm", "focal", "jammy") +DISTRIBUTIONS = ("focal", "bullseye", "jammy", "bookworm") SETTINGS_SECTION = "=settings" DEVELOPMENT_SECTION = "=development" diff --git a/tools/packages_test.py b/tools/packages_test.py index 44c06535f..ad7e644b7 100644 --- a/tools/packages_test.py +++ b/tools/packages_test.py @@ -4,15 +4,15 @@ from tools.packages import list_packages, load_packages PACKAGE_INI = """ [common] -postgresql = jammy, focal +postgresql = focal, jammy # Some comment -curl = jammy, bullseye +curl = bullseye, jammy [legacy] -some-package = bullseye, focal +some-package = focal, bullseye [=development] -ffmpeg = jammy, bullseye, focal +ffmpeg = focal, bullseye, jammy """ result_jammy = {"curl", "postgresql"}