diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 121a4095..ff89b601 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -8,3 +8,5 @@ Fixes #0000 * Change 1 * Change 2 + + diff --git a/.travis.yml b/.travis.yml index 14fb2308..4e7c8d72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,20 @@ 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 @@ -18,3 +22,4 @@ deploy: api_key: $NPM_KEY on: branch: master + condition: "$VERSION_CHANGED == 'yes'" diff --git a/scripts/versionCheck.sh b/scripts/versionCheck.sh deleted file mode 100644 index 130650b8..00000000 --- a/scripts/versionCheck.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -set -e # halt script on error - -TARGET_BRANCH=$1 -IS_PULL_REQUEST=$2 # false if not a pull request, - -# Makes sure travis checks version only if doing a pull request -if [ "$IS_PULL_REQUEST" != "false" ] - then - PACKAGE_VERSION=$(grep version package.json | awk -F: '{ print $2 }' | sed 's/[\",]//g' | tr -d ':space:') && echo "Package Version: $PACKAGE_VERSION" - CURRENT_PACKAGE_VERSION=$(git show 'origin/'"$TARGET_BRANCH"':package.json' | grep version | head -1 | awk -F: '{ print $2 }' | sed 's/[\",]//g' | tr -d ':space:') && echo "Latest Version: $CURRENT_PACKAGE_VERSION" - - if [ "$CURRENT_PACKAGE_VERSION" = "$PACKAGE_VERSION" ] - then - echo "Failure reason: Version number should be bumped." - exit 1 - fi -fi