summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2021-08-11 19:59:57 +0100
committerDavid Robertson <davidr@element.io>2021-08-11 19:59:57 +0100
commit33ef86aa2515f623fa6e8657d16c918b6a6d9da5 (patch)
tree42785b59a86e3c8df04ade348ae998e6e483cff5
parentAdd changelog entry and signoff (diff)
downloadsynapse-33ef86aa2515f623fa6e8657d16c918b6a6d9da5.tar.xz
Rename ci to .ci
-rw-r--r--.ci/postgres-config.yaml (renamed from ci/postgres-config.yaml)2
-rwxr-xr-x.ci/scripts/postgres_exec.py (renamed from ci/scripts/postgres_exec.py)0
-rwxr-xr-x.ci/scripts/test_old_deps.sh (renamed from ci/scripts/test_old_deps.sh)0
-rwxr-xr-x.ci/scripts/test_synapse_port_db.sh (renamed from ci/scripts/test_synapse_port_db.sh)0
-rw-r--r--.ci/sqlite-config.yaml (renamed from ci/sqlite-config.yaml)4
-rw-r--r--.ci/test_db.db (renamed from ci/test_db.db)bin19296256 -> 19296256 bytes
-rw-r--r--.ci/worker-blacklist (renamed from ci/worker-blacklist)0
-rw-r--r--.github/workflows/tests.yml6
8 files changed, 6 insertions, 6 deletions
diff --git a/ci/postgres-config.yaml b/.ci/postgres-config.yaml

index 511fef495d..f5a4aecd51 100644 --- a/ci/postgres-config.yaml +++ b/.ci/postgres-config.yaml
@@ -3,7 +3,7 @@ # CI's Docker setup at the point where this file is considered. server_name: "localhost:8800" -signing_key_path: "ci/test.signing.key" +signing_key_path: ".ci/test.signing.key" report_stats: false diff --git a/ci/scripts/postgres_exec.py b/.ci/scripts/postgres_exec.py
index 0f39a336d5..0f39a336d5 100755 --- a/ci/scripts/postgres_exec.py +++ b/.ci/scripts/postgres_exec.py
diff --git a/ci/scripts/test_old_deps.sh b/.ci/scripts/test_old_deps.sh
index 8b473936f8..8b473936f8 100755 --- a/ci/scripts/test_old_deps.sh +++ b/.ci/scripts/test_old_deps.sh
diff --git a/ci/scripts/test_synapse_port_db.sh b/.ci/scripts/test_synapse_port_db.sh
index 9ee0ad42fc..9ee0ad42fc 100755 --- a/ci/scripts/test_synapse_port_db.sh +++ b/.ci/scripts/test_synapse_port_db.sh
diff --git a/ci/sqlite-config.yaml b/.ci/sqlite-config.yaml
index fd5a1c1451..3373743da3 100644 --- a/ci/sqlite-config.yaml +++ b/.ci/sqlite-config.yaml
@@ -3,14 +3,14 @@ # schema and run background updates on it. server_name: "localhost:8800" -signing_key_path: "ci/test.signing.key" +signing_key_path: ".ci/test.signing.key" report_stats: false database: name: "sqlite3" args: - database: "ci/test_db.db" + database: ".ci/test_db.db" # Suppress the key server warning. trusted_key_servers: [] diff --git a/ci/test_db.db b/.ci/test_db.db
index a0d9f16a75..a0d9f16a75 100644 --- a/ci/test_db.db +++ b/.ci/test_db.db
Binary files differdiff --git a/ci/worker-blacklist b/.ci/worker-blacklist
index 5975cb98cf..5975cb98cf 100644 --- a/ci/worker-blacklist +++ b/.ci/worker-blacklist
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 572bc81b0f..df2e3901cb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml
@@ -142,7 +142,7 @@ jobs: uses: docker://ubuntu:bionic # For old python and sqlite with: workdir: /github/workspace - entrypoint: ci/scripts/test_old_deps.sh + entrypoint: .ci/scripts/test_old_deps.sh env: TRIAL_FLAGS: "--jobs=2" - name: Dump logs @@ -229,7 +229,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Prepare test blacklist - run: cat sytest-blacklist ci/worker-blacklist > synapse-blacklist-with-workers + run: cat sytest-blacklist .ci/worker-blacklist > synapse-blacklist-with-workers - name: Run SyTest run: /bootstrap.sh synapse working-directory: /src @@ -278,7 +278,7 @@ jobs: - uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - run: ci/scripts/test_synapse_port_db.sh + - run: .ci/scripts/test_synapse_port_db.sh complement: if: ${{ !failure() && !cancelled() }}