From 0bb47200c7f74936d33ca8b82e14e769dc10da73 Mon Sep 17 00:00:00 2001 From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com> Date: Wed, 23 Feb 2022 15:58:05 +0000 Subject: [PATCH 1/3] Do not install `synapse` only `matrix-synapse`. Synapse is something entirely different: https://pypi.org/project/synapse/ --- .github/workflows/integration_tests.yml | 2 +- .github/workflows/sanity_test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index cac35fb1fc..0ff172e913 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -85,7 +85,7 @@ jobs: run: | python3 -m venv .synapse source .synapse/bin/activate - pip install synapse matrix-synapse + pip install matrix-synapse curl https://raw.githubusercontent.com/matrix-org/synapse/develop/demo/start.sh -o start.sh chmod 777 start.sh ./start.sh --no-rate-limit diff --git a/.github/workflows/sanity_test.yml b/.github/workflows/sanity_test.yml index 483926fa1f..d11fb54e60 100644 --- a/.github/workflows/sanity_test.yml +++ b/.github/workflows/sanity_test.yml @@ -47,7 +47,7 @@ jobs: run: | python3 -m venv .synapse source .synapse/bin/activate - pip install synapse matrix-synapse + pip install matrix-synapse curl -sL https://raw.githubusercontent.com/matrix-org/synapse/develop/demo/start.sh \ | sed s/127.0.0.1/0.0.0.0/g | sed 's/http:\/\/localhost/http:\/\/10.0.2.2/g' | bash -s -- --no-rate-limit - uses: actions/setup-java@v2 From 5c4ca79888c44a17f3986f4114162d6ec4cf1b51 Mon Sep 17 00:00:00 2001 From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com> Date: Wed, 23 Feb 2022 15:59:43 +0000 Subject: [PATCH 2/3] Remove use of explicit pip cache. We use setup-python to install the python we use, which has inbuilt caching of python dependencies. https://github.com/actions/setup-python#caching-packages-dependencies --- .github/workflows/integration_tests.yml | 8 -------- .github/workflows/sanity_test.yml | 8 -------- .github/workflows/sync-from-external-sources.yml | 16 ---------------- 3 files changed, 32 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 0ff172e913..7b221fcc21 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -65,14 +65,6 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.8 - - name: Cache pip - uses: actions/cache@v2 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip - restore-keys: | - ${{ runner.os }}-pip- - ${{ runner.os }}- - uses: actions/cache@v2 with: path: | diff --git a/.github/workflows/sanity_test.yml b/.github/workflows/sanity_test.yml index d11fb54e60..6154f88674 100644 --- a/.github/workflows/sanity_test.yml +++ b/.github/workflows/sanity_test.yml @@ -27,14 +27,6 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.8 - - name: Cache pip - uses: actions/cache@v2 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip - restore-keys: | - ${{ runner.os }}-pip- - ${{ runner.os }}- - uses: actions/cache@v2 with: path: | diff --git a/.github/workflows/sync-from-external-sources.yml b/.github/workflows/sync-from-external-sources.yml index 5a5d8152ff..a890082575 100644 --- a/.github/workflows/sync-from-external-sources.yml +++ b/.github/workflows/sync-from-external-sources.yml @@ -15,14 +15,6 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.8 - - name: Cache pip - uses: actions/cache@v2 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip - restore-keys: | - ${{ runner.os }}-pip- - ${{ runner.os }}- - name: Install Prerequisite dependencies run: | pip install BeautifulSoup4 @@ -49,14 +41,6 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.8 - - name: Cache pip - uses: actions/cache@v2 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-pip - restore-keys: | - ${{ runner.os }}-pip- - ${{ runner.os }}- - name: Install Prerequisite dependencies run: | pip install requests From c2a67a03a47530154e570925acb38f6c7db83320 Mon Sep 17 00:00:00 2001 From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com> Date: Wed, 23 Feb 2022 16:01:22 +0000 Subject: [PATCH 3/3] Do not run synapse in a venv. We do not need to, so simplify the configuration. --- .github/workflows/integration_tests.yml | 2 -- .github/workflows/sanity_test.yml | 2 -- 2 files changed, 4 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 7b221fcc21..a90e66f929 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -75,8 +75,6 @@ jobs: ${{ runner.os }}-gradle- - name: Start synapse server run: | - python3 -m venv .synapse - source .synapse/bin/activate pip install matrix-synapse curl https://raw.githubusercontent.com/matrix-org/synapse/develop/demo/start.sh -o start.sh chmod 777 start.sh diff --git a/.github/workflows/sanity_test.yml b/.github/workflows/sanity_test.yml index 6154f88674..f6f5ae151f 100644 --- a/.github/workflows/sanity_test.yml +++ b/.github/workflows/sanity_test.yml @@ -37,8 +37,6 @@ jobs: ${{ runner.os }}-gradle- - name: Start synapse server run: | - python3 -m venv .synapse - source .synapse/bin/activate pip install matrix-synapse curl -sL https://raw.githubusercontent.com/matrix-org/synapse/develop/demo/start.sh \ | sed s/127.0.0.1/0.0.0.0/g | sed 's/http:\/\/localhost/http:\/\/10.0.2.2/g' | bash -s -- --no-rate-limit