diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-09-28 10:51:09 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-09-28 10:51:09 +0100 |
| commit | 9c8cec5dab134cebd749021023858b55be2a7a0a (patch) | |
| tree | 74484a28e7a8d258bb1fd312aff5dfa731327105 /.circleci | |
| parent | Merge branch 'rav/fix_expiring_cache_len' into erikj/destination_retry_cache (diff) | |
| parent | Merge pull request #3794 from matrix-org/erikj/faster_typing (diff) | |
| download | synapse-9c8cec5dab134cebd749021023858b55be2a7a0a.tar.xz | |
Merge remote-tracking branch 'origin/develop' into erikj/destination_retry_cache
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/config.yml | 54 |
1 files changed, 46 insertions, 8 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 605430fb3f..3cb14793fc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,21 @@ version: 2 jobs: + dockerhubuploadrelease: + machine: true + steps: + - checkout + - run: docker build -f docker/Dockerfile -t matrixdotorg/synapse:$CIRCLE_TAG . + - run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD + - run: docker push matrixdotorg/synapse:$CIRCLE_TAG + dockerhubuploadlatest: + machine: true + steps: + - checkout + - run: docker build -f docker/Dockerfile -t matrixdotorg/synapse:$CIRCLE_SHA1 . + - run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD + - run: docker tag matrixdotorg/synapse:$CIRCLE_SHA1 matrixdotorg/synapse:latest + - run: docker push matrixdotorg/synapse:$CIRCLE_SHA1 + - run: docker push matrixdotorg/synapse:latest sytestpy2: machine: true steps: @@ -99,23 +115,45 @@ workflows: version: 2 build: jobs: - - sytestpy2 - - sytestpy2postgres - - sytestpy3 - - sytestpy3postgres + - sytestpy2: + filters: + branches: + only: /develop|master|release-.*/ + - sytestpy2postgres: + filters: + branches: + only: /develop|master|release-.*/ + - sytestpy3: + filters: + branches: + only: /develop|master|release-.*/ + - sytestpy3postgres: + filters: + branches: + only: /develop|master|release-.*/ - sytestpy2merged: filters: branches: - ignore: /develop|master/ + ignore: /develop|master|release-.*/ - sytestpy2postgresmerged: filters: branches: - ignore: /develop|master/ + ignore: /develop|master|release-.*/ - sytestpy3merged: filters: branches: - ignore: /develop|master/ + ignore: /develop|master|release-.*/ - sytestpy3postgresmerged: filters: branches: - ignore: /develop|master/ + ignore: /develop|master|release-.*/ + - dockerhubuploadrelease: + filters: + tags: + only: /^v[0-9].[0-9]+.[0-9]+(.[0-9]+)?/ + branches: + ignore: /.*/ + - dockerhubuploadlatest: + filters: + branches: + only: master |