diff options
| author | Erik Johnston <erik@matrix.org> | 2019-12-06 11:28:44 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-12-06 11:33:34 +0000 |
| commit | 2ace775d88391181365c3c6b1be5c231127edf7f (patch) | |
| tree | c74f635c4241533ed5cb9f921b3edd4ce397a0b5 /.buildkite | |
| parent | Remove unused var (diff) | |
| parent | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925) (diff) | |
| download | synapse-2ace775d88391181365c3c6b1be5c231127edf7f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/make_database_class
Diffstat (limited to '.buildkite')
| -rw-r--r-- | .buildkite/postgres-config.yaml | 2 | ||||
| -rw-r--r-- | .buildkite/sqlite-config.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.buildkite/postgres-config.yaml b/.buildkite/postgres-config.yaml index dcf72cfda0..a35fec394d 100644 --- a/.buildkite/postgres-config.yaml +++ b/.buildkite/postgres-config.yaml @@ -1,7 +1,7 @@ # Configuration file used for testing the 'synapse_port_db' script. # Tells the script to connect to the postgresql database that will be available in the # CI's Docker setup at the point where this file is considered. -server_name: "localhost:8080" +server_name: "test" signing_key_path: "/src/.buildkite/test.signing.key" diff --git a/.buildkite/sqlite-config.yaml b/.buildkite/sqlite-config.yaml index 5276aaff03..635b921764 100644 --- a/.buildkite/sqlite-config.yaml +++ b/.buildkite/sqlite-config.yaml @@ -1,7 +1,7 @@ # Configuration file used for testing the 'synapse_port_db' script. # Tells the 'update_database' script to connect to the test SQLite database to upgrade its # schema and run background updates on it. -server_name: "localhost:8080" +server_name: "test" signing_key_path: "/src/.buildkite/test.signing.key" |