Skip to content

Commit

Permalink
Add yarn.lock, update CI services to run yarn
Browse files Browse the repository at this point in the history
  • Loading branch information
xPaw committed Feb 20, 2018
1 parent 1ce2792 commit f646fbb
Show file tree
Hide file tree
Showing 4 changed files with 5,821 additions and 12 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
node_modules/
npm-debug.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
package-lock.json

.nyc_output/
Expand Down
15 changes: 10 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,17 @@ matrix:
- node_js: 8 # Version used to deploy to npm registry
env: BUILD_ENV=production

cache:
directories:
- ~/.npm
cache: yarn

before_install:
- yarn global add greenkeeper-lockfile@1

before_script:
- NODE_ENV=$BUILD_ENV npm run build
- greenkeeper-lockfile-update
- NODE_ENV=$BUILD_ENV yarn build

after_script:
- greenkeeper-lockfile-upload

notifications:
email:
Expand Down Expand Up @@ -49,5 +54,5 @@ deploy:
# If the current release is a stable release, remove potential pre-release tag
after_deploy: |
if [ "$(npm_dist_tag)" == "latest" ]; then
npm dist-tag rm thelounge next || true
yarn tag remove thelounge next || true
fi
12 changes: 6 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ environment:

install:
- ps: Install-Product node $env:nodejs_version
- appveyor-retry npm install
- npm run build
- npm install mocha-appveyor-reporter
- yarn --frozen-lockfile
- yarn build
- yarn add mocha-appveyor-reporter
- echo --reporter mocha-appveyor-reporter >> test/mocha.opts

test_script:
- node --version
- npm --version
- npm test
- yarn --version
- yarn test

# cache npm modules
cache:
- '%AppData%\npm-cache -> package.json'
- "%LOCALAPPDATA%\\Yarn"

# Don't actually build
build: off
Loading

0 comments on commit f646fbb

Please sign in to comment.