Skip to content

Commit

Permalink
Merge 212f784 into dc86a42
Browse files Browse the repository at this point in the history
  • Loading branch information
honzajavorek committed Jul 4, 2018
2 parents dc86a42 + 212f784 commit d2435eb
Show file tree
Hide file tree
Showing 9 changed files with 8,769 additions and 44 deletions.
11 changes: 7 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
# Distributed code (source code lives in /src)
/lib
/lib/

# Common for .gitignore and .npmignore
.DS_Store
coverage/
site/
cov.*
.vagrant
*.log
.env
.envrc

# List specific to .gitignore
node_modules
.idea/
_build
.vscode/
/docs/_build

!.vscode/launch.json
16 changes: 8 additions & 8 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# Source code (distributed code lives in /lib)
/src
/src/

# Common for .gitignore and .npmignore
.DS_Store
coverage/
site/
cov.*
.vagrant
*.log
.env
.envrc

# List specific to .npmignore
/docs/
/test/
.travis.yml
appveyor.yml
.npmignore
docs/
test/
mkdocs.yml
provisioning.sh
.eslintrc.js
Vagrantfile
.eslintignore
*.apib
*.md

Expand Down
11 changes: 7 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ before_install:
# Travis CI has only shallow clone of the repository. We need to get the 'master' branch
# so 'conventional-changelog-lint' could compare commits and lint them: marionebl/conventional-changelog-lint#7
- "git remote set-branches origin master && git fetch && git checkout master && git checkout -"
- "npm -g install npm@5"
- "npm -g install npm@6"
- "pip3 install --user -r docs/requirements.txt"
install: "npm install --no-optional"
jobs:
include:
# stage 1, all following runs in parallel:
- stage: "quality checks & tests"
env: "JOB=quality_checks"
node_js: "8"
node_js: "10"
script: "npm run lint && npm run docs:lint"
- node_js: "8"
- node_js: "10"
env: "JOB=docs_build_dry_run" # why dry run? because production build happens directly on ReadTheDocs infrastructure
script: "npm run docs:build"
- node_js: "6"
Expand All @@ -36,9 +36,12 @@ jobs:
- node_js: "8"
env: "JOB=node8"
script: "npm run test:coverage && npm run coveralls"
- node_js: "10"
env: "JOB=node10"
script: "npm run test:coverage && npm run coveralls"

# stage 2
- stage: "semantic release"
node_js: "8"
node_js: "10"
script: "npm run semantic-release || true"
if: fork = false AND branch = master AND type = push
16 changes: 0 additions & 16 deletions Vagrantfile

This file was deleted.

6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
environment:
nodejs_version: "8"
nodejs_version: "10"
install:
- ps: Install-Product node 8
- "npm -g install npm@5"
- ps: Install-Product node 10
- "npm -g install npm@6"
- "set PATH=%APPDATA%\\npm;%PATH%"
- "npm install --no-optional"
cache:
Expand Down
4 changes: 2 additions & 2 deletions docs/install-node.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ if [ "$READTHEDOCS" = 'True' ]; then
fi
. ~/.nvm/nvm.sh

nvm install 8
nvm use 8
nvm install 10
nvm use 10

npm install --no-optional

Expand Down
Loading

0 comments on commit d2435eb

Please sign in to comment.