summary refs log tree commit diff
diff options
context:
space:
mode:
authorDan Callahan <danc@element.io>2021-05-26 13:16:06 +0100
committerGitHub <noreply@github.com>2021-05-26 13:16:06 +0100
commit913a761a53640b725245408ff8f49bf54493707c (patch)
tree0132e2b0fea82362be2558fdfc9d95543be57a10
parentAdd an admin API for unprotecting local media from quarantine (#10040) (diff)
downloadsynapse-913a761a53640b725245408ff8f49bf54493707c.tar.xz
Tell CircleCI to build Docker images from `main` (#9906)
The `only` field takes a string or list of strings per the Circle docs:
https://circleci.com/docs/2.0/configuration-reference/#branches

Signed-off-by: Dan Callahan <danc@element.io>
-rw-r--r--.circleci/config.yml2
-rw-r--r--changelog.d/9906.misc1
2 files changed, 2 insertions, 1 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml

index 1ac48a71ba..cf1989eff9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml
@@ -41,7 +41,7 @@ workflows: - dockerhubuploadlatest: filters: branches: - only: master + only: [ master, main ] commands: docker_prepare: diff --git a/changelog.d/9906.misc b/changelog.d/9906.misc new file mode 100644
index 0000000000..667d51a4c0 --- /dev/null +++ b/changelog.d/9906.misc
@@ -0,0 +1 @@ +Tell CircleCI to build Docker images from `main` branch.