Skip to content

Commit

Permalink
Switch from npm to yarn, and commit yarn.lock
Browse files Browse the repository at this point in the history
  • Loading branch information
astorije committed Sep 21, 2018
1 parent 78df4f9 commit d4ddbfc
Show file tree
Hide file tree
Showing 4 changed files with 2,069 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
node_modules/
npm-debug.log
yarn-error.log

.nyc_output/
coverage/
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ node_js:
- 6 # EOL: April 2019

after_script:
- npm run coveralls
- yarn coveralls

notifications:
email:
Expand All @@ -16,7 +16,7 @@ notifications:

# Identifies `a.b.c-xxx.n` tags as pre-releases, and `a.b.c` as stable releases
before_deploy: |
function npm_dist_tag() {
function dist_tag() {
if [[ "$TRAVIS_TAG" = *"-"* ]]; then
echo "next"
else
Expand All @@ -26,7 +26,7 @@ before_deploy: |
deploy:
provider: npm
tag: $(npm_dist_tag)
tag: $(dist_tag)
email:
secure: bXNlycnAR6z+PawxKBB6fSKuoAQb61bH3gYhOD8yIP5Lx0zj6HHDj8Ze4jsE8X133RVVWUPONqw0D09b/w0ahWfRlY80/TzOlT6HgYHTLKuKZsgGrLDbSBBGeXzU4I+/Zuo3fJ7xGIUIRe4qrUELnUYNE7VuB1Un78xTmkuZ0cY=
api_key:
Expand All @@ -38,6 +38,6 @@ 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
if [ "$(dist_tag)" == "latest" ]; then
yarn tag remove thelounge next || true
fi
12 changes: 8 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,18 @@ environment:

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

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

# cache npm modules
cache:
- "%LOCALAPPDATA%\\Yarn"

# Don't actually build
build: off
Loading

0 comments on commit d4ddbfc

Please sign in to comment.