diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-05-15 15:14:33 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-05-28 13:56:07 +0100 |
| commit | 68f46e07f2bab943051f46c03912946ade2edea9 (patch) | |
| tree | 3abfb476ccb1ccf67d86df1713c3fe62c3eac909 /.buildkite | |
| parent | Add ProfileStore to synapse_port_db as it has a dinsic background update (diff) | |
| download | synapse-68f46e07f2bab943051f46c03912946ade2edea9.tar.xz | |
Fix sytest CI
* Switch sytest-synapse to sytest-dinsic * Be sure to invalidate our caches properly! * Remove duplicate encryption state key definition * Remove old config option name in comment * Make dinsic the default in merge_base_branch
Diffstat (limited to '.buildkite')
| -rwxr-xr-x | .buildkite/merge_base_branch.sh | 2 | ||||
| -rw-r--r-- | .buildkite/pipeline.yml | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.buildkite/merge_base_branch.sh b/.buildkite/merge_base_branch.sh index 361440fd1a..d0a7aef8cb 100755 --- a/.buildkite/merge_base_branch.sh +++ b/.buildkite/merge_base_branch.sh @@ -12,7 +12,7 @@ if [[ -z $BUILDKITE_PULL_REQUEST_BASE_BRANCH ]]; then # It probably hasn't had a PR opened yet. Since all PRs land on develop, we # can probably assume it's based on it and will be merged into it. - GITBASE="develop" + GITBASE="dinsic" else # Get the reference, using the GitHub API GITBASE=$BUILDKITE_PULL_REQUEST_BASE_BRANCH diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 85b34f73a4..5877ff0883 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -252,7 +252,7 @@ steps: - "bash /bootstrap.sh synapse" plugins: - docker#v3.0.1: - image: "matrixdotorg/sytest-synapse:py35" + image: "matrixdotorg/sytest-synapse:dinsic" propagate-environment: true always-pull: true workdir: "/src" @@ -285,7 +285,7 @@ steps: - "bash /bootstrap.sh synapse" plugins: - docker#v3.0.1: - image: "matrixdotorg/sytest-synapse:py35" + image: "matrixdotorg/sytest-synapse:dinsic" propagate-environment: true always-pull: true workdir: "/src" @@ -322,7 +322,7 @@ steps: - "bash /bootstrap.sh synapse" plugins: - docker#v3.0.1: - image: "matrixdotorg/sytest-synapse:py35" + image: "matrixdotorg/sytest-synapse:dinsic" propagate-environment: true always-pull: true workdir: "/src" @@ -356,7 +356,7 @@ steps: - "bash /bootstrap.sh synapse" plugins: - docker#v3.0.1: - image: "matrixdotorg/sytest-synapse:py38" + image: "matrixdotorg/sytest-synapse:dinsic" propagate-environment: true always-pull: true workdir: "/src" @@ -393,7 +393,7 @@ steps: - "bash /bootstrap.sh synapse" plugins: - docker#v3.0.1: - image: "matrixdotorg/sytest-synapse:py37" + image: "matrixdotorg/sytest-synapse:dinsic" propagate-environment: true always-pull: true workdir: "/src" |