From 2924c8ece5dbaec36a51812cc40811a883639b47 Mon Sep 17 00:00:00 2001 From: Akash Srivastava Date: Tue, 9 Jul 2019 14:20:30 +0530 Subject: [PATCH] Update circle ci config (#165) * Update package.json to exclude building external client Signed-off-by: Akash Srivastava * Update circle ci config yaml - Builds were failing because of ci cache. Update it to use new files instead of cached ones. Signed-off-by: Akash Srivastava --- .circleci/config.yml | 11 +++++++++-- client/package.json | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 35a1759633..74b5ae4ae7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -79,7 +79,10 @@ jobs: steps: - checkout # Convoluted set of steps here to mimic Makefile actions of bind-mounting different dirs into container - - run: mv client/* /home/weave/ + # CI is using cached files and it was failing. + # - run: mv client/* /home/weave/ + - run: cp -rv client/* /home/weave/ + - run: cp client/.babelrc /home/weave/ - run: cd /home/weave; mkdir build ; yarn install; yarn run build ; mv build scope/client - run: cd /home/weave; mkdir build-external; yarn install; yarn run build-external; mv build-external scope/client - run: cd /home/weave; mkdir tmp ; yarn install; yarn run bundle ; mv tmp scope @@ -93,9 +96,13 @@ jobs: client-test: <<: *client-defaults steps: + # CI is using cached files and it was failing. - checkout - run: | - mv client/app client/test /home/weave/ + cp -r client/* /home/weave/ + cp client/.babelrc /home/weave + rm -rf /home/weave/node_modules + cd /home/weave; yarn install cd /home/weave; yarn run lint cd /home/weave; yarn test diff --git a/client/package.json b/client/package.json index 8a2eb9f3d8..1b84f93e19 100644 --- a/client/package.json +++ b/client/package.json @@ -100,7 +100,7 @@ }, "scripts": { "build": "webpack --config webpack.production.config.js", - "build-external": "EXTERNAL=true webpack --config webpack.production.config.js", + "build-external": "EXTERNAL=false webpack --config webpack.production.config.js", "copy-pkg-files": "cp package.json build-pkg/ && cp -R app/styles build-pkg/", "build-pkg": "mkdir -p build-pkg && node node_modules/.bin/babel app/scripts --ignore __tests__ --out-dir build-pkg && yarn run copy-pkg-files", "bundle": "mkdir -p bundle && yarn run build-pkg && cd ./build-pkg && yarn pack --filename ../bundle/weave-scope.tgz",