Merge pull request #7671 from freedomofpress/stg-focals-fond-farewell

Remove code required to support Ubuntu Focal.

Author: legoktm

.github/workflows/ci.yml

@@ -12,7 +12,6 @@ jobs:
       fail-fast: false
       matrix:
         ubuntu_version:
-          - focal
           - noble
     container: ubuntu:${{ matrix.ubuntu_version }}
     steps:
@@ -28,9 +27,9 @@ jobs:
             build-essential python3-virtualenv python3-dev enchant-2 file apache2-dev jq libarchive-tools
           virtualenv .venv
           # TODO: this should be one step, but there are too many conflicting dependencies
-          ./.venv/bin/pip install -r securedrop/requirements/${{ matrix.ubuntu_version }}/test-requirements.txt
-          ./.venv/bin/pip install -r securedrop/requirements/${{ matrix.ubuntu_version }}/requirements.txt
-          ./.venv/bin/pip install -r securedrop/requirements/${{ matrix.ubuntu_version }}/develop-requirements.txt
+          ./.venv/bin/pip install -r securedrop/requirements/test-requirements.txt
+          ./.venv/bin/pip install -r securedrop/requirements/requirements.txt
+          ./.venv/bin/pip install -r securedrop/requirements/develop-requirements.txt
       - name: Run lint
         run: |
           git config --global --add safe.directory $GITHUB_WORKSPACE

.github/workflows/demo.yml

@@ -9,7 +9,7 @@ defaults:
 jobs:
   build:
     name: Build demo
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       DOCKERIZE_VERSION: v0.6.1
     steps:
@@ -18,7 +18,7 @@ jobs:
           persist-credentials: false
       - name: Build container
         run: |
-          podman build -t demo -f securedrop/dockerfiles/focal/python3/DemoDockerfile .
+          podman build -t demo -f securedrop/dockerfiles/noble/python3/DemoDockerfile .
       - name: Install dockerize
         run: |
           wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz

Cargo.lock

@@ -1,7 +1,6 @@
 [workspace]
 
 members = [
-    "noble-migration",
     "redwood",
 ]
 

Cargo.toml

@@ -1,4 +1,4 @@
-ARG UBUNTU_VERSION=focal
+ARG UBUNTU_VERSION=noble
 FROM ubuntu:${UBUNTU_VERSION}
 
 ARG DEBIAN_FRONTEND=noninteractive

builder/Dockerfile

@@ -14,14 +14,13 @@ source /etc/os-release
 # Make a copy of the source tree since we do destructive operations on it
 cp -R /src/securedrop /srv/securedrop
 mkdir /srv/rust
-cp -R /src/noble-migration /srv/rust/noble-migration
 cp -R /src/redwood /srv/rust/redwood
 cp /src/Cargo.{toml,lock} /srv/rust/
 cd /srv/securedrop/
 
 # Control the version of setuptools used in the default construction of virtual environments
 # TODO: get rid of this when we switch to reproducible wheels
-pip3 download --no-deps --require-hashes -r requirements/${VERSION_CODENAME}/requirements.txt --dest /tmp/requirements-download
+pip3 download --no-deps --require-hashes -r requirements/requirements.txt --dest /tmp/requirements-download
 rm -f /usr/share/python-wheels/setuptools-*.whl
 mv /tmp/requirements-download/setuptools-*.whl /usr/share/python-wheels/
 

builder/build-debs-securedrop.sh

@@ -16,16 +16,10 @@ git status --short
 
 # --- END keep this section in sync. ---
 
-export UBUNTU_VERSION="${UBUNTU_VERSION:-focal}"
+export UBUNTU_VERSION="${UBUNTU_VERSION:-noble}"
 
 OCI_RUN_ARGUMENTS="--user=root -v $(pwd):/src:Z -e HOST_UID=$(id -u) -e HOST_GID=$(id -g)"
 
-# Setuptools_scm 8.3.0 breaks focal builds - so let's temporarily constrain it to 8.1.0
-TMP_CONSTRAINT="/srv/securedrop/requirements/${UBUNTU_VERSION}/constraints.txt"
-if [[ $UBUNTU_VERSION == "focal" ]]; then
-    OCI_RUN_ARGUMENTS="-e PIP_CONSTRAINT=${TMP_CONSTRAINT} ${OCI_RUN_ARGUMENTS}"
-fi
-
 # Default to podman if available
 if which podman > /dev/null 2>&1; then
     OCI_BIN="podman"