diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ccb71aaa82..84bc73a9e6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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: @@ -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 @@ -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: @@ -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' @@ -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 @@ -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 diff --git a/docker/Dockerfile.debian.builder b/docker/Dockerfile.debian.builder index 5e5ecf2fcc..0950122c33 100644 --- a/docker/Dockerfile.debian.builder +++ b/docker/Dockerfile.debian.builder @@ -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 \ diff --git a/docs/changelog.rst b/docs/changelog.rst index 44fd264b8e..6e8d5a9cf9 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -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) ----------------------------