summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-12-09 16:07:59 +0000
committerRichard van der Hoff <richard@matrix.org>2020-12-09 16:10:50 +0000
commit4b08c387078aacefb7a06da2076eefc6673c4d55 (patch)
tree5b0c46c8aa3c65019bba4f64448fad7fb2d15953
parentMerge branch 'rav/fix_multiarch_builds' into rav/v1.24.0-multiarch (diff)
downloadsynapse-v1.24.0-multiarch.tar.xz
Tweak CircleCI config to trigger rebuild of v1.24.0 v1.24.0-multiarch
-rw-r--r--.circleci/config.yml29
1 files changed, 2 insertions, 27 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 088da55735..a0dad04d07 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,39 +8,14 @@ jobs:
       - docker_prepare
       - run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD
       - docker_build:
-          tag: -t matrixdotorg/synapse:${CIRCLE_TAG}
-          platforms: linux/amd64
-      - docker_build:
-          tag: -t matrixdotorg/synapse:${CIRCLE_TAG}
+          tag: -t matrixdotorg/synapse:v1.24.0
           platforms: linux/amd64,linux/arm/v7,linux/arm64
 
-  dockerhubuploadlatest:
-    docker:
-      - image: docker:git
-    steps:
-      - checkout
-      - docker_prepare
-      - run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD
-      - docker_build:
-          tag: -t matrixdotorg/synapse:latest
-          platforms: linux/amd64
-      - docker_build:
-          tag: -t matrixdotorg/synapse:latest
-          platforms: linux/amd64,linux/arm/v7,linux/arm64
 
 workflows:
   build:
     jobs:
-      - dockerhubuploadrelease:
-          filters:
-            tags:
-              only: /v[0-9].[0-9]+.[0-9]+.*/
-            branches:
-              ignore: /.*/
-      - dockerhubuploadlatest:
-          filters:
-            branches:
-              only: master
+      - dockerhubuploadrelease
 
 commands:
   docker_prepare: