diff --git a/.travis.yml b/.travis.yml index ee3eba3b93..34ae409e92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -jobs: +matrix: include: # Test Typescript package - stage: test @@ -10,8 +10,6 @@ jobs: - npm run build - npm run test - npm run docs - # Clear package.json overrides made when installing @stencila/dev-config - - git checkout package.json after_success: - bash <(curl -s https://codecov.io/bash) -cF ts @@ -37,7 +35,6 @@ jobs: language: r r: release dist: xenial - sudo: true r_binary_packages: - covr @@ -70,6 +67,10 @@ jobs: - npm run build - npm run docs + after_success: + # Clear package.json overrides made when installing @stencila/dev-config + - git checkout package.json + deploy: # Deploy a new version of NPM package and create a Github release # This creates a new version tag, which will then trigger the @@ -81,9 +82,9 @@ jobs: # Deploy documentation to Github Pages # See https://docs.travis-ci.com/user/deployment/pages/ - provider: pages - skip-cleanup: true - github-token: $GITHUB_TOKEN - local-dir: built + skip_cleanup: true + github_token: $GITHUB_TOKEN + local_dir: built on: branch: master @@ -99,9 +100,13 @@ jobs: script: - echo "Nothing to do; just deploying" + after_success: + # Clear package.json overrides made when installing @stencila/dev-config + - git checkout package.json + deploy: provider: pypi - user: $PYPI_USERNAME + username: $PYPI_USERNAME password: $PYPI_PASSWORD server: https://test.pypi.org/legacy/ on: diff --git a/Makefile b/Makefile index 7353503442..9c656b9c2b 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ checkBindings: @echo "🔗 Finished building language bindings" @for i in $$(git ls-files -m); do \ if [ "$$i" = $(PYBINDINGS) ] || [ "$$i" = $(RBINDINGS) ] ; then \ - echo "☝️ Bindings have changes, committing the changes"; \ + echo "☝️ Bindings have changed, committing the changes"; \ make commitBindings; \ exit; \ fi \ diff --git a/package.json b/package.json index 823fe8f91a..8a977978f1 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,11 @@ } }, "eslintConfig": { - "extends": "@stencila/eslint-config" + "extends": "@stencila/eslint-config", + "env": { + "node": true, + "jest": true + } }, "eslintIgnore": [ "built", @@ -111,11 +115,13 @@ "husky": { "hooks": { "pre-commit": "pretty-quick --staged", + "pre-push": "make checkBindings", "commit-msg": "commitlint -E HUSKY_GIT_PARAMS" } }, "prettier": "@stencila/dev-config/prettier-config.json", "release": { - "extends": "@stencila/semantic-release-config" + "extends": "@stencila/semantic-release-config", + "message": "chore(release): ${nextRelease.version}\n\n${nextRelease.notes}" } }