Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
jconstance-amplify committed Apr 21, 2020
2 parents 2948c62 + 91c9a4f commit 8475ff2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 25 deletions.
2 changes: 2 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Expand Up @@ -8,3 +8,5 @@ Fixes #0000

* Change 1
* Change 2

<!--- Please remember to allow edits from maintainers: https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork --->
17 changes: 11 additions & 6 deletions .travis.yml
@@ -1,20 +1,25 @@
language: node_js
node_js:
- 10.4.0
- 10.4.0
before_install:
# Only deploy if the version number has changed
- |
if git diff --unified=0 $TRAVIS_COMMIT_RANGE package.json | grep version ; then
export VERSION_CHANGED="yes"
fi
- npm i -g npm@6.4.1
install:
- npm install
- npm install
script:
- npm run lint
- bash scripts/versionCheck.sh $TRAVIS_BRANCH $TRAVIS_PULL_REQUEST
- npm test
- npm run lint
- npm test
before_deploy:
- npm run build
- npm run build
deploy:
skip_cleanup: true
provider: npm
email: $NPM_EMAIL
api_key: $NPM_KEY
on:
branch: master
condition: "$VERSION_CHANGED == 'yes'"
19 changes: 0 additions & 19 deletions scripts/versionCheck.sh

This file was deleted.

0 comments on commit 8475ff2

Please sign in to comment.