From aabdbfc36cb0a7e931d6cc35145343f5f9ec8fb3 Mon Sep 17 00:00:00 2001 From: Oli Evans Date: Fri, 22 Feb 2019 00:24:31 +0000 Subject: [PATCH 1/3] fix: tweak cluster params for ci build see: https://github.com/ipfs-shipyard/ipfs-webui/pull/965#pullrequestreview-206605757 License: MIT Signed-off-by: Oli Evans --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0af8b76a0..b7e398d18 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,10 +28,11 @@ jobs: command: | # Upload build dir to cluster.ipfs.io hash=$(ipfs-cluster-ctl \ + --quietest \ --host /dnsaddr/cluster.ipfs.io \ --basic-auth $CLUSTER_USER:$CLUSTER_PASSWORD \ - add --rmin 3 --rmax 3 --name "$DOMAIN" \ - --recursive /tmp/workspace/$BUILD_DIR | tail -n1 | cut -d " " -f 2 ) + add --name "$DOMAIN build $CIRCLE_BUILD_NUM" \ + --recursive /tmp/workspace/$BUILD_DIR ) preview_url=https://ipfs.io/ipfs/$hash From c309dd9e5152264958a5f57fd18df7907de054b3 Mon Sep 17 00:00:00 2001 From: Oli Evans Date: Fri, 22 Feb 2019 09:14:34 +0000 Subject: [PATCH 2/3] fix: use --quieter when adding to cluster License: MIT Signed-off-by: Oli Evans --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b7e398d18..4395879b0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ jobs: command: | # Upload build dir to cluster.ipfs.io hash=$(ipfs-cluster-ctl \ - --quietest \ + --quieter \ --host /dnsaddr/cluster.ipfs.io \ --basic-auth $CLUSTER_USER:$CLUSTER_PASSWORD \ add --name "$DOMAIN build $CIRCLE_BUILD_NUM" \ From 18fabed3afd60d8c1515ff1c16946585ce0d5683 Mon Sep 17 00:00:00 2001 From: Oli Evans Date: Fri, 22 Feb 2019 09:34:40 +0000 Subject: [PATCH 3/3] fix: --quieter is a flag to add License: MIT Signed-off-by: Oli Evans --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4395879b0..7b275ad52 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,10 +28,10 @@ jobs: command: | # Upload build dir to cluster.ipfs.io hash=$(ipfs-cluster-ctl \ - --quieter \ --host /dnsaddr/cluster.ipfs.io \ --basic-auth $CLUSTER_USER:$CLUSTER_PASSWORD \ - add --name "$DOMAIN build $CIRCLE_BUILD_NUM" \ + add --quieter \ + --name "$DOMAIN build $CIRCLE_BUILD_NUM" \ --recursive /tmp/workspace/$BUILD_DIR ) preview_url=https://ipfs.io/ipfs/$hash