Skip to content

Drop Ubuntu 20.04 support #5119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
submarcos wants to merge 3 commits into
base: master
Choose a base branch
from
+9 −26
Open

Drop Ubuntu 20.04 support #5119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40cfc28
chore: remove support for Ubuntu 20.04 and update related configurations
submarcos Nov 24, 2025
c32985d
chore: update Dockerfile
submarcos Nov 24, 2025
62ee749
Merge branch 'master' into drop_ubuntu_20.04
submarcos Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 3 additions & 19 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:

strategy:
matrix:
os: ['focal-3.10', 'jammy-3.10', 'noble-3.12']
os: ['jammy-3.10', 'noble-3.12']
tests-env: ['tests', 'tests_nds']

env:
Expand Down Expand Up @@ -112,13 +112,7 @@ jobs:
libvips
apt-get install -y --no-install-recommends postgis

- name: Install python venv for focal
if: ${{ matrix.os == 'focal-3.10'}}
run: |
uv venv -p python3.10 venv

- name: Install python venv
if: ${{ matrix.os != 'focal-3.10'}}
run: |
uv venv venv

Expand Down Expand Up @@ -166,7 +160,7 @@ jobs:
needs: [ test ]
strategy:
matrix:
os: ['focal-3.10', 'jammy-3.10', 'noble-3.12']
os: ['jammy-3.10', 'noble-3.12']
tests-env: ['tests', 'tests_nds']

env:
Expand Down Expand Up @@ -217,10 +211,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
os: ['focal', 'jammy', 'noble']
os: ['jammy', 'noble']
include:
- os: 'focal'
code: '20.04'
- os: 'jammy'
code: '22.04'
- os: 'noble'
Expand Down Expand Up @@ -429,12 +421,6 @@ jobs:
steps:
- uses: actions/checkout@v6

- name: Download 20.04 debian artifact
uses: actions/download-artifact@v7
if: ${{ github.event_name == 'release' && github.event.action == 'created' }}
with:
name: focal

- name: Download 22.04 debian artifact
if: ${{ github.event_name == 'release' && github.event.action == 'created' }}
uses: actions/download-artifact@v7
Expand Down Expand Up @@ -505,11 +491,9 @@ jobs:
echo "${{ github.ref }} : Publishing as $DEB_COMPONENT package"
scp -P ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no /home/runner/work/Geotrek-admin/Geotrek-admin/geotrek-admin_*_amd64.deb ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:/srv/packages/incoming/$DEB_COMPONENT/
if [[ "${{ github.ref }}" == *"dev"* ]]; then
ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} make focal_dev -C /srv/packages
ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} make jammy_dev -C /srv/packages
ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} make noble_dev -C /srv/packages
else
ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} make focal_main -C /srv/packages
ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} make jammy_main -C /srv/packages
ssh -p ${{ secrets.SSH_PORT }} -o StrictHostKeyChecking=no ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }} make noble_main -C /srv/packages
fi
Expand Down
9 changes: 2 additions & 7 deletions docker/Dockerfile.debian.builder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,9 @@ FROM ${DISTRO} AS base


RUN apt-get update -qq -o Acquire::Languages=none && \
env DEBIAN_FRONTEND=noninteractive apt-get install -yqq curl lsb-release && \
if test "$(lsb_release -cs)" = 'focal' ; then \
env DEBIAN_FRONTEND=noninteractive apt-get install -yqq software-properties-common; \
install -d /usr/share/geotrek; \
curl -o /usr/share/geotrek/apt.geotrek.org.key --fail https://packages.geotrek.fr/geotrek.gpg.key; \
echo "deb [signed-by=/usr/share/geotrek/apt.geotrek.org.key] https://packages.geotrek.fr/ubuntu $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/geotrek.list; \
add-apt-repository ppa:jyrki-pulliainen/dh-virtualenv; fi &&\
env DEBIAN_FRONTEND=noninteractive apt-get install -yqq \
curl \
lsb-release \
nano \
dpkg-dev \
debhelper \
Expand Down
4 changes: 4 additions & 0 deletions docs/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ CHANGELOG
2.121.2+dev (XXXX-XX-XX)
----------------------------

**Breaking changes**

* Ubuntu focal 20.04 debian package is not supported anymore. Please update or migrate your server to Ubuntu 24.04.


2.121.2 (2025-12-16)
----------------------------
Expand Down