Skip to content

Commit

Permalink
Switch back from yarn to npm
Browse files Browse the repository at this point in the history
  • Loading branch information
yuya-oc committed Jan 7, 2019
1 parent de03d51 commit ea0b28d
Show file tree
Hide file tree
Showing 7 changed files with 14,333 additions and 10,030 deletions.
12 changes: 6 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ jobs:
steps:
- checkout
- restore_cache:
key: npm-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}
key: npm-{{ arch }}-{{ .Branch }}-{{ checksum "package-lock.json" }}
- restore_cache:
key: npm-{{ arch }}-{{ .Branch }}-{{ checksum "src/yarn.lock" }}
key: npm-{{ arch }}-{{ .Branch }}-{{ checksum "src/package-lock.json" }}
- run: apt-get update && apt-get -y install --no-install-recommends jq icnsutils graphicsmagick tzdata
- run: yarn
- run: npm install
- run: npm run build
- run: npm run package:windows
- run: jq '.mac.target=["zip"]' electron-builder.json > /tmp/electron-builder.json && cp /tmp/electron-builder.json .
Expand All @@ -21,13 +21,13 @@ jobs:
- run: sh -x ./scripts/cp_artifacts.sh release /tmp/artifacts
- run: npm run lint:js
- save_cache:
key: npm-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}
key: npm-{{ arch }}-{{ .Branch }}-{{ checksum "package-lock.json" }}
paths:
- "node_modules"
- "~/.cache/electron"
- "~/.cache/electron-builder"
- save_cache:
key: npm-{{ arch }}-{{ .Branch }}-{{ checksum "src/yarn.lock" }}
key: npm-{{ arch }}-{{ .Branch }}-{{ checksum "src/package-lock.json" }}
paths:
- "src/node_modules"
- store_artifacts:
Expand All @@ -45,7 +45,7 @@ jobs:
steps:
- checkout
- run: apt-get update && apt-get -y install --no-install-recommends libgconf-2-4
- run: yarn
- run: npm install
# https://github.com/SeleniumHQ/docker-selenium/issues/222#issuecomment-221307583
- run: DBUS_SESSION_BUS_ADDRESS=/dev/null xvfb-run npm test
- run: mkdir -p /tmp/test-results
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ npm-debug.log*

build/
dist/
package-lock.json
src/package-lock.json

test-results.xml
test_config.json
Expand Down
3 changes: 1 addition & 2 deletions docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@
- C++ environment which supports C++11 (e.g. VS 2015, Xcode, GCC)
- Python 2.7
- Node.js 8.2.0 or later
- Yarn
- Git

### Installing dependencies
After installation, dependencies of `src/` directory are also installed.

```
$ yarn
$ npm install
```

### Building
Expand Down
Loading

0 comments on commit ea0b28d

Please sign in to comment.