From dd5e3129d9e9f3710339e72e5d221cd35813529e Mon Sep 17 00:00:00 2001 From: "H. Shay" Date: Fri, 7 Jul 2023 13:45:53 -0700 Subject: [PATCH 1/5] drop debian buster --- .github/workflows/twisted_trunk.yml | 2 +- docs/deprecation_policy.md | 2 +- docs/development/contributing_guide.md | 2 +- scripts-dev/build_debian_packages.py | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/twisted_trunk.yml b/.github/workflows/twisted_trunk.yml index 55081f8133b2..4485ab351839 100644 --- a/.github/workflows/twisted_trunk.yml +++ b/.github/workflows/twisted_trunk.yml @@ -96,7 +96,7 @@ jobs: if: needs.check_repo.outputs.should_run_workflow == 'true' runs-on: ubuntu-latest container: - image: matrixdotorg/sytest-synapse:buster + image: matrixdotorg/sytest-synapse:focal volumes: - ${{ github.workspace }}:/src diff --git a/docs/deprecation_policy.md b/docs/deprecation_policy.md index 46c18d7d3205..840366485072 100644 --- a/docs/deprecation_policy.md +++ b/docs/deprecation_policy.md @@ -23,7 +23,7 @@ people building from source should ensure they can fetch recent versions of Rust (e.g. by using [rustup](https://rustup.rs/)). The oldest supported version of SQLite is the version -[provided](https://packages.debian.org/buster/libsqlite3-0) by +[provided](https://packages.debian.org/bullseye/libsqlite3-0) by [Debian oldstable](https://wiki.debian.org/DebianOldStable). Context diff --git a/docs/development/contributing_guide.md b/docs/development/contributing_guide.md index f5ba55afb7a3..e9210b177695 100644 --- a/docs/development/contributing_guide.md +++ b/docs/development/contributing_guide.md @@ -322,7 +322,7 @@ The following command will let you run the integration test with the most common configuration: ```sh -$ docker run --rm -it -v /path/where/you/have/cloned/the/repository\:/src:ro -v /path/to/where/you/want/logs\:/logs matrixdotorg/sytest-synapse:buster +$ docker run --rm -it -v /path/where/you/have/cloned/the/repository\:/src:ro -v /path/to/where/you/want/logs\:/logs matrixdotorg/sytest-synapse:focal ``` (Note that the paths must be full paths! You could also write `$(realpath relative/path)` if needed.) diff --git a/scripts-dev/build_debian_packages.py b/scripts-dev/build_debian_packages.py index 4c9f134ddd83..8fe10f2cb57f 100755 --- a/scripts-dev/build_debian_packages.py +++ b/scripts-dev/build_debian_packages.py @@ -23,7 +23,6 @@ # These are expanded inside the dockerfile to be a fully qualified image name. # e.g. docker.io/library/debian:bullseye DISTS = ( - "debian:buster", # oldstable: EOL 2022-08 "debian:bullseye", "debian:bookworm", "debian:sid", From 202029d71e87cb6eb7a1a011b3e7b43b0d436fd6 Mon Sep 17 00:00:00 2001 From: "H. Shay" Date: Fri, 7 Jul 2023 13:49:05 -0700 Subject: [PATCH 2/5] newsfragment --- changelog.d/15893.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/15893.misc diff --git a/changelog.d/15893.misc b/changelog.d/15893.misc new file mode 100644 index 000000000000..2e188a2ec4b8 --- /dev/null +++ b/changelog.d/15893.misc @@ -0,0 +1 @@ +Drop debian buster. From 7f0878963824af47564e3fe9c4ee0cc728ef1a88 Mon Sep 17 00:00:00 2001 From: "H. Shay" Date: Mon, 10 Jul 2023 09:14:55 -0700 Subject: [PATCH 3/5] update comment --- .github/workflows/twisted_trunk.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/twisted_trunk.yml b/.github/workflows/twisted_trunk.yml index 4485ab351839..a3affd08f7fe 100644 --- a/.github/workflows/twisted_trunk.yml +++ b/.github/workflows/twisted_trunk.yml @@ -96,6 +96,7 @@ jobs: if: needs.check_repo.outputs.should_run_workflow == 'true' runs-on: ubuntu-latest container: + # We're using ubuntu:focal because it uses Python 3.8 which is our minimum supported Python version image: matrixdotorg/sytest-synapse:focal volumes: - ${{ github.workspace }}:/src From a8580ba6ae28859241ad5e06cbf9826df02b41db Mon Sep 17 00:00:00 2001 From: "H. Shay" Date: Mon, 10 Jul 2023 09:28:27 -0700 Subject: [PATCH 4/5] update comment --- .github/workflows/twisted_trunk.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/twisted_trunk.yml b/.github/workflows/twisted_trunk.yml index a3affd08f7fe..f7a4ee7c1375 100644 --- a/.github/workflows/twisted_trunk.yml +++ b/.github/workflows/twisted_trunk.yml @@ -96,7 +96,10 @@ jobs: if: needs.check_repo.outputs.should_run_workflow == 'true' runs-on: ubuntu-latest container: - # We're using ubuntu:focal because it uses Python 3.8 which is our minimum supported Python version + # We're using ubuntu:focal because it uses Python 3.8 which is our minimum supported Python version. + # This job is a canary to warn us about unreleased twisted changes that would cause problems for us if + # they were to be released immediately. For simplicity's sake (and to save CI runners) we use the oldest + # version, assuming that any incompatibilities on newer versions would also be present on the oldest. image: matrixdotorg/sytest-synapse:focal volumes: - ${{ github.workspace }}:/src From 83ca347dcb8092847e605572412153338dcd4b9c Mon Sep 17 00:00:00 2001 From: Shay Date: Mon, 10 Jul 2023 09:30:50 -0700 Subject: [PATCH 5/5] Update changelog.d/15893.misc Co-authored-by: Eric Eastwood --- changelog.d/15893.misc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/15893.misc b/changelog.d/15893.misc index 2e188a2ec4b8..656d73b23120 100644 --- a/changelog.d/15893.misc +++ b/changelog.d/15893.misc @@ -1 +1 @@ -Drop debian buster. +Drop Debian Buster since we no longer support Python 3.7.