Skip to content
This repository was archived by the owner on Jan 21, 2020. It is now read-only.

Commit 0155bad

Browse files
author
David Chung
authored
Make sure PR builds don't break with S3 upload
CircleCI is set up to *not* copy credentials into build for PR branches. So this was causing builds to break. This PR fixes that by moving the minio set up into the deployment steps of release and master branches.
1 parent 75c0766 commit 0155bad

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

circle.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ test:
4545
post:
4646
# Report to codecov
4747
- cd $WORKDIR && bash <(curl -s https://codecov.io/bash)
48-
# Install minio.io for S3 bucket uploads
49-
- wget https://dl.minio.io/client/mc/release/linux-amd64/mc && chmod a+x ./mc && sudo cp ./mc /usr/local/bin
50-
- mc config host add $S3_MINIO https://s3.amazonaws.com $S3_KEY_ID $S3_SECRET_KEY S3v4
51-
- mc policy download $S3_BUCKET
5248

5349
deployment:
5450
pr:
@@ -61,6 +57,10 @@ deployment:
6157
commands:
6258
- docker login -e $DOCKER_HUB_EMAIL -u $DOCKER_HUB_USER -p $DOCKER_HUB_PASSWD
6359
- DOCKER_PUSH=true DOCKER_TAG_LATEST=false DOCKER_TAG=$(echo $CIRCLE_BRANCH | awk -F - '{print $2}') DOCKER_BUILD_FLAGS="--rm=false" make build-docker
60+
# Install minio.io for S3 bucket uploads
61+
- wget https://dl.minio.io/client/mc/release/linux-amd64/mc && chmod a+x ./mc && sudo cp ./mc /usr/local/bin
62+
- mc config host add $S3_MINIO https://s3.amazonaws.com $S3_KEY_ID $S3_SECRET_KEY S3v4
63+
- mc policy download $S3_BUCKET
6464
- tar cvfz ./$S3_BUILD_PR -C build .
6565
- mc cp ./$S3_BUILD_PR $S3_BUCKET/
6666

@@ -69,6 +69,10 @@ deployment:
6969
commands:
7070
- docker login -e $DOCKER_HUB_EMAIL -u $DOCKER_HUB_USER -p $DOCKER_HUB_PASSWD
7171
- DOCKER_PUSH=true DOCKER_TAG_LATEST=true DOCKER_TAG="master-$CIRCLE_BUILD_NUM" DOCKER_BUILD_FLAGS="--rm=false" make build-docker
72+
# Install minio.io for S3 bucket uploads
73+
- wget https://dl.minio.io/client/mc/release/linux-amd64/mc && chmod a+x ./mc && sudo cp ./mc /usr/local/bin
74+
- mc config host add $S3_MINIO https://s3.amazonaws.com $S3_KEY_ID $S3_SECRET_KEY S3v4
75+
- mc policy download $S3_BUCKET
7276
- tar cvfz ./$S3_BUILD_MASTER -C build .
7377
- mc cp ./$S3_BUILD_MASTER $S3_BUCKET/
7478
- mc cp ./$S3_BUILD_MASTER $S3_BUCKET/infrakit-latest.gz

0 commit comments

Comments
 (0)