From 4015b48b6a1d5f5a8753927e48177f7763a0ecda Mon Sep 17 00:00:00 2001 From: Vinay Pinto Date: Wed, 10 Apr 2019 11:50:36 +0200 Subject: [PATCH] Circle CI 2.0 works Squashed commit of the following: commit 0c141646d0e63a3db3015395709ac080d495b89e Author: Vinay Pinto Date: Wed Apr 10 11:45:26 2019 +0200 docker login needs no email commit d3fc3ca982ece66d59de99ba1992718fb4ffe30c Author: Vinay Pinto Date: Wed Apr 10 11:24:57 2019 +0200 add some docker config commit f80696c1a321f4b81ef54c0a87bead903a4073e4 Author: Vinay Pinto Date: Wed Apr 10 10:59:50 2019 +0200 Removed old circle 1.0 commit 82f1e4efec5977091efdf0508b37d90a270e1d43 Author: Vinay Pinto Date: Wed Apr 10 10:53:44 2019 +0200 Gliding back commit 70d8ef367943d69e7e303d7a7fece5fe475c72c8 Merge: fdcaf2c 63e4829 Author: Utsav Tiwary Date: Tue Apr 2 17:22:24 2019 +0200 Merge pull request #147 from utsavtiwary04/circleci2 publish and clean after make commit 63e4829debd05cb0be2d68c52ce1f2d53730d8db Author: Utsav Tiwary Date: Tue Apr 2 17:22:04 2019 +0200 publish and clean after make commit fdcaf2c85e50dea4d9f980b7a0ef72b55e493bca Merge: 79f78df 752d313 Author: Utsav Tiwary Date: Tue Apr 2 17:17:11 2019 +0200 Merge pull request #146 from utsavtiwary04/circleci2 Circleci2 commit 752d3131a9a0ebc370e0e79bb124b1ab73ecb5f2 Author: Utsav Tiwary Date: Tue Apr 2 17:15:27 2019 +0200 use npm instead of yarn commit 500b057a26f9b764193340b96afe5b7e8631d0f0 Author: Utsav Tiwary Date: Mon Apr 1 18:21:23 2019 +0200 purge cmdtest commit 79f78dfbb6be77edb0d4cd0d861d95fba15d2ecf Merge: 9aa16bd ce49527 Author: Utsav Tiwary Date: Mon Apr 1 18:12:18 2019 +0200 Merge pull request #145 from utsavtiwary04/circleci2 yarn instead of yarn install commit ce4952773f7a102f89edce6b02d430c8686faf45 Author: Utsav Tiwary Date: Mon Apr 1 18:11:50 2019 +0200 yarn instead of yarn install commit 9aa16bd711c8549b2c4cf58178fe7f055bf1a1fe Merge: 8d20980 5e71e08 Author: Utsav Tiwary Date: Mon Apr 1 18:09:36 2019 +0200 Merge pull request #144 from utsavtiwary04/circleci2 yarn instead of yarn install commit 5e71e08872d798fbf07254f8b578459fef9f4de7 Author: Utsav Tiwary Date: Mon Apr 1 18:09:12 2019 +0200 yarn instead of yarn install commit 8d2098041254e1be01b7063f3936d6aac215f0e6 Merge: 949dc1d 24cdabe Author: Utsav Tiwary Date: Mon Apr 1 17:59:32 2019 +0200 Merge pull request #143 from utsavtiwary04/circleci2 remove cmdtest commit 24cdabe5df24687321777adf2170fec242db4202 Author: Utsav Tiwary Date: Mon Apr 1 17:58:55 2019 +0200 remove cmdtest commit 949dc1d3b8909d87424d34921745f31402c2d859 Merge: 4dfe313 6dbbb0c Author: Utsav Tiwary Date: Mon Apr 1 17:56:28 2019 +0200 Merge pull request #142 from utsavtiwary04/circleci2 install yarn just before triggering yarn install commit 6dbbb0c6fd6c8538f9c73f934542ccf179b18ebf Author: Utsav Tiwary Date: Mon Apr 1 17:55:50 2019 +0200 install yarn just before triggering yarn install commit 4dfe31317467e19929ddaf8b4e574849b28e99ab Merge: e81f371 7700b31 Author: Utsav Tiwary Date: Mon Apr 1 17:52:31 2019 +0200 Merge pull request #141 from utsavtiwary04/circleci2 removed apt-update commit 7700b31ee6cbba710d87bb873071442e77c0c121 Author: Utsav Tiwary Date: Mon Apr 1 17:52:00 2019 +0200 removed apt-update commit e81f371a5c53a1f5808776792782060b0ba775f0 Merge: ff9a3e7 807f767 Author: Utsav Tiwary Date: Mon Apr 1 17:40:00 2019 +0200 Merge pull request #140 from utsavtiwary04/circleci2 update apt before yarn install commit 807f767c1454fb98609a15dcf4cfff5dfda8769e Author: Utsav Tiwary Date: Mon Apr 1 17:39:36 2019 +0200 update apt befoer yarn install commit ff9a3e7bbde3ccf053d4332952ea8316b5d09b2d Merge: c3ba415 0e6ee3a Author: Utsav Tiwary Date: Mon Apr 1 17:36:11 2019 +0200 Merge pull request #139 from utsavtiwary04/circleci2 install yarn differently commit 0e6ee3ac743c51b1948cd6bb9357a1f4a398b964 Author: Utsav Tiwary Date: Mon Apr 1 17:35:16 2019 +0200 install yarn differently commit c3ba4155d60b1ea9675c94b159986df2630eef19 Merge: fd69dc6 78093be Author: Utsav Tiwary Date: Mon Apr 1 17:27:16 2019 +0200 Merge pull request #138 from utsavtiwary04/circleci2 list directories where install is run commit 78093bebd6426c8289ff18235ba8bc7a9111e085 Author: Utsav Tiwary Date: Mon Apr 1 17:26:33 2019 +0200 list directories where install is run commit fd69dc62c7a9972275dd2526aa849e76087a560f Merge: 6c708f8 03acfad Author: Utsav Tiwary Date: Mon Apr 1 17:20:40 2019 +0200 Merge pull request #137 from utsavtiwary04/circleci2 removed unwanted changes commit 03acfad916d182e15860f4fb6c817633ca080e5c Merge: e85fa95 6c708f8 Author: Utsav Tiwary Date: Mon Apr 1 17:19:55 2019 +0200 sync with circleci commit e85fa95bdaf5a152cb2847e8ac20042f4c309cfc Author: Utsav Tiwary Date: Mon Apr 1 17:18:16 2019 +0200 removed unwanted changes commit 6c708f86b22e404af614be69466ec937763932a5 Merge: affe0f6 db207a9 Author: Utsav Tiwary Date: Mon Apr 1 15:59:11 2019 +0200 Merge pull request #136 from utsavtiwary04/circleci2 Added ci-publish to push image to quay.io commit db207a9d77e2ac69b0f9c19db9502f456997aa54 Author: Utsav Tiwary Date: Mon Apr 1 15:58:13 2019 +0200 Added -t tag for tagging images commit a8aefe5c9c6122264625f098e1f2bbad9b5fa88c Author: Utsav Tiwary Date: Mon Apr 1 15:54:11 2019 +0200 Added new docker publish for quay commit affe0f6d6f869d91b0cf1115906b23bf0b34a2cd Merge: ce12993 e9e130d Author: Utsav Tiwary Date: Wed Mar 27 18:02:39 2019 +0100 Merge pull request #135 from utsavtiwary04/circleci2 Removed terminal output flag in docker command commit e9e130de6aaee199e7dcbf2a38f26e9e4e7c14ce Author: Utsav Tiwary Date: Wed Mar 27 18:02:15 2019 +0100 Removed terminal output flag in docker command commit ce12993b40ad8665e7947fe33eb7b17ba1bb9001 Merge: c74ef21 5e0bdf1 Author: Utsav Tiwary Date: Wed Mar 27 15:51:08 2019 +0100 Merge pull request #134 from utsavtiwary04/circleci2 Added yarn installation via apt-get to circleci config(sudo) commit 5e0bdf164de523d578c9c02979adc6cfd2a1169b Author: Utsav Tiwary Date: Wed Mar 27 15:50:02 2019 +0100 Added yarn installation via apt-get to circleci config(sudo) commit c74ef21130cb4faa6af29aa01fde0bdff59efce4 Merge: 368f353 76c3f60 Author: Utsav Tiwary Date: Wed Mar 27 15:48:51 2019 +0100 Merge pull request #133 from utsavtiwary04/circleci2 Added yarn installation via apt-get to circleci config commit 76c3f60bb7b2a435d689751b2497c4f3cad2136b Author: Utsav Tiwary Date: Wed Mar 27 15:45:55 2019 +0100 Added yarn installation via apt-get to circleci config commit 368f353a375a3b9449adb1b8b2c15a4faafcee05 Merge: 47c9de3 f1397d2 Author: Utsav Tiwary Date: Wed Mar 27 15:33:20 2019 +0100 Merge pull request #132 from utsavtiwary04/circleci2 Added npm to circleci-docker image commit f1397d2616a923cb760f410323bc62119c46282a Author: Utsav Tiwary Date: Wed Mar 27 15:32:30 2019 +0100 Added npm to circleci-docker image commit 47c9de3f1a7300bde1de4f47cd2d1684f43f7827 Merge: 1e8d2af 376af68 Author: Utsav Tiwary Date: Wed Mar 27 15:18:50 2019 +0100 Merge pull request #131 from utsavtiwary04/circleci2 Added yarn installation to circle config commit 376af687eaed2c9612089283d2a492a06594ca94 Author: Utsav Tiwary Date: Wed Mar 27 15:17:56 2019 +0100 Added yarn installation to circle config commit 1e8d2afe88e8bc1738a094ea612a513460a72bde Merge: acdfa8a b4c25b0 Author: Utsav Tiwary Date: Tue Mar 26 18:16:32 2019 +0100 Merge pull request #130 from utsavtiwary04/circleci2 Upgrade laika to circle ci 2 commit b4c25b0309c8b231ad6952e90048c3340268e9dd Author: Utsav Tiwary Date: Tue Mar 26 18:13:52 2019 +0100 Formatting fix commit 16d2843e6b08676dd8babc06c3bfbabf1e8e24e1 Author: Utsav Tiwary Date: Tue Mar 26 18:12:43 2019 +0100 Upgrade laika to circle ci 2 --- .circleci/config.yml | 13 +++++++++++-- Makefile | 2 +- circle.yml | 32 -------------------------------- scripts/build.sh | 2 +- scripts/ci-publish.sh | 16 ++++++++++++++++ scripts/install.sh | 2 +- scripts/publish.sh | 2 +- 7 files changed, 31 insertions(+), 38 deletions(-) delete mode 100644 circle.yml create mode 100644 scripts/ci-publish.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 341db4c..d7caf4f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,9 +3,18 @@ jobs: build: docker: - image: circleci/golang:1 + working_directory: /go/src/github.com/MEDIGO/laika steps: - - setup_remote_docker - checkout + - run: go get -u -v -t github.com/Masterminds/glide + - run: glide install -v + - run: touch .env + - run: pwd + - run: ls + - run: make install + - run: make build + - run: make report + - setup_remote_docker: + docker_layer_caching: true - run: make image - run: make publish - - run: make clean diff --git a/Makefile b/Makefile index 82c8ac3..33c65ef 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all: install lint test build report +all: install build report publish clean .PHONY: all build: diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 1b46317..0000000 --- a/circle.yml +++ /dev/null @@ -1,32 +0,0 @@ -machine: - services: - - docker - node: - version: 8.9.4 - environment: - PROJECT_GOPATH: "${HOME}/.go_project" - PROJECT_PARENT_PATH: "${PROJECT_GOPATH}/src/github.com/MEDIGO" - PROJECT_PATH: "${PROJECT_PARENT_PATH}/laika" - GOPATH: "${HOME}/.go_workspace:/usr/local/go_workspace:${PROJECT_GOPATH}" - LAIKA_TEST_MYSQL_HOST: localhost - LAIKA_TEST_MYSQL_USERNAME: ubuntu - LAIKA_TEST_MYSQL_DBNAME: circle_test - -dependencies: - pre: - - go get github.com/Masterminds/glide - - go get github.com/jteeuwen/go-bindata/... - - yarn global add webpack - override: - - mkdir -p "${PROJECT_PARENT_PATH}" - - rsync -avC "${HOME}/laika/" "${PROJECT_PATH}" - -test: - override: - - cd "${PROJECT_PATH}" && make - -deployment: - hub: - branch: master - commands: - - cd "${PROJECT_PATH}" && make image publish diff --git a/scripts/build.sh b/scripts/build.sh index d571956..e7a720b 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -5,4 +5,4 @@ set -o nounset set -o pipefail GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o bin/laika . -(cd dashboard && yarn run build) +(cd dashboard && npm run build) diff --git a/scripts/ci-publish.sh b/scripts/ci-publish.sh new file mode 100644 index 0000000..b8a3432 --- /dev/null +++ b/scripts/ci-publish.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +set -o errexit +set -o nounset +set -o pipefail + +if [[ -z ${CIRCLE_SHA1:-} ]]; then + COMMIT=$(git rev-parse HEAD) +else + COMMIT=${CIRCLE_SHA1} +fi + +docker tag quay.io/medigo/laika:latest quay.io/medigo/laika:${COMMIT} +docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USER} -p ${DOCKER_PASS} +docker push quay.io/medigo/laika:latest +docker push quay.io/medigo/laika:${COMMIT} diff --git a/scripts/install.sh b/scripts/install.sh index 4865345..863eb45 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -9,4 +9,4 @@ if ! which glide > /dev/null 2>&1 ; then fi glide install -(cd dashboard && yarn install) +(cd dashboard && sudo apt install curl && curl -sL https://deb.nodesource.com/setup_6.x | sudo bash - && sudo apt-get install -y nodejs && sudo apt-get install -y npm && sudo npm install) diff --git a/scripts/publish.sh b/scripts/publish.sh index 379c51c..f451cee 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -11,6 +11,6 @@ else fi docker tag medigo/laika:latest medigo/laika:${COMMIT} -docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USER} -p ${DOCKER_PASS} +docker login -u ${DOCKER_USER} -p ${DOCKER_PASS} docker push medigo/laika:latest docker push medigo/laika:${COMMIT}