From d9797578052f65dd8649b784a11c77dc22f620c4 Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Tue, 21 Mar 2023 17:50:28 +0000
Subject: [PATCH 1/2] Allow running twisted trunk against other branches

I would like to do this so we can try Synapse's typechecking against a
specific branch that the project solicited tests for, see
https://mail.python.org/archives/list/twisted@python.org/message/GGO5JHA5S475AK6JZ3GCC3GIHGKQYM6Y/
---
 .github/workflows/twisted_trunk.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/twisted_trunk.yml b/.github/workflows/twisted_trunk.yml
index db514571c4af..7999dd956dec 100644
--- a/.github/workflows/twisted_trunk.yml
+++ b/.github/workflows/twisted_trunk.yml
@@ -5,6 +5,13 @@ on:
     - cron: 0 8 * * *
 
   workflow_dispatch:
+    inputs:
+      twisted_ref:
+        description: Commit, branch or tag to checkout from upstream Twisted.
+        required: false
+        default: 'trunk'
+        type: string
+
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -29,7 +36,7 @@ jobs:
           extras: "all"
       - run: |
           poetry remove twisted
-          poetry add --extras tls git+https://github.com/twisted/twisted.git#trunk
+          poetry add --extras tls git+https://github.com/twisted/twisted.git#${{ inputs.twisted_ref }}
           poetry install --no-interaction --extras "all test"
       - name: Remove warn_unused_ignores from mypy config
         run: sed '/warn_unused_ignores = True/d' -i mypy.ini

From 66cc19550728aa5fc4a234fbcb431cb382504649 Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Tue, 21 Mar 2023 17:53:04 +0000
Subject: [PATCH 2/2] Changelog

---
 changelog.d/15302.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/15302.misc

diff --git a/changelog.d/15302.misc b/changelog.d/15302.misc
new file mode 100644
index 000000000000..aadadf4b43ed
--- /dev/null
+++ b/changelog.d/15302.misc
@@ -0,0 +1 @@
+Allow running the Twisted trunk job against other branches.