Skip to content

Commit

Permalink
Update circle ci config (#165)
Browse files Browse the repository at this point in the history
* Update package.json to exclude building external client

Signed-off-by: Akash Srivastava <akashsrivastava4927@gmail.com>

* 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 <akashsrivastava4927@gmail.com>
  • Loading branch information
qiell committed Aug 13, 2019
1 parent 3ff80cd commit 2924c8e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
11 changes: 9 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 2924c8e

Please sign in to comment.