summary refs log tree commit diff
diff options
context:
space:
mode:
authorSean Quah <seanq@element.io>2022-03-25 18:38:58 +0000
committerSean Quah <seanq@element.io>2022-03-28 13:57:09 +0100
commit3637d7f9b8b937cb7d689f154c2257afaea6792e (patch)
treee88d1c924fbd773d0624889f1135514b971ae6d3
parentMerge branch 'develop' into squah/pyproject-poetry-contribs (diff)
downloadsynapse-3637d7f9b8b937cb7d689f154c2257afaea6792e.tar.xz
Install twisted trunk into the correct virtual env and use offline mode
so that twisted trunk doesn't get overridden with the pinned version of
twisted.

Signed-off-by: Sean Quah <seanq@element.io>
-rw-r--r--.github/workflows/twisted_trunk.yml13
1 files changed, 8 insertions, 5 deletions
diff --git a/.github/workflows/twisted_trunk.yml b/.github/workflows/twisted_trunk.yml
index cd5bf73258..2af75dae82 100644
--- a/.github/workflows/twisted_trunk.yml
+++ b/.github/workflows/twisted_trunk.yml
@@ -59,16 +59,19 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: matrix-org/setup-python-poetry@dmr/try-extras
-        with:
-          python-version: "3.x"
-          extras: "all"
       - name: Patch dependencies
-        run: .ci/patch_for_twisted_trunk.sh
+        run: >-
+          ln -s -T /venv /src/.venv &&
+          .ci/patch_for_twisted_trunk.sh &&
+          unlink /src/.venv
         working-directory: /src
       - name: Run SyTest
         run: /bootstrap.sh synapse
         working-directory: /src
+        env:
+          # Use offline mode to avoid reinstalling the pinned version of
+          # twisted.
+          OFFLINE: 1
       - name: Summarise results.tap
         if: ${{ always() }}
         run: /sytest/scripts/tap_to_gha.pl /logs/results.tap