diff options
| author | Sam Potts <sam@potts.es> | 2018-07-10 15:24:22 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-10 15:24:22 +1000 |
| commit | 676b46e4a785575fc0ad98d9e96dfc0041f028a3 (patch) | |
| tree | e41bed89a749e0e49a3f1a2d556b6034d355c966 | |
| parent | ba33fd82779fa27dcee600c02a8e97d5364b9fe1 (diff) | |
| parent | 82a119c67fd9c287fefb49a2c80a48692d4f7fbb (diff) | |
| download | plyr-676b46e4a785575fc0ad98d9e96dfc0041f028a3.tar.lz plyr-676b46e4a785575fc0ad98d9e96dfc0041f028a3.tar.xz plyr-676b46e4a785575fc0ad98d9e96dfc0041f028a3.zip | |
Merge pull request #1093 from friday/travis-2
Verify PR instructions with Travis
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rwxr-xr-x | .travis/omit-dist.sh | 5 | ||||
| -rwxr-xr-x | .travis/prevent-base-master.sh | 5 |
3 files changed, 15 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index d2722414..3203fb95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ language: node_js -node_js: - - 'lts/*' +node_js: lts/* script: - - npm run lint - - npm run build +- bash .travis/prevent-base-master.sh +- bash .travis/omit-dist.sh +- npm run lint +- npm run build diff --git a/.travis/omit-dist.sh b/.travis/omit-dist.sh new file mode 100755 index 00000000..f107a6b9 --- /dev/null +++ b/.travis/omit-dist.sh @@ -0,0 +1,5 @@ +#!/bin/bash +if [ $TRAVIS_BRANCH == "develop" ] && $(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qE "^(demo/)?dist/"); then + echo 'Build output ("dist" and "demo/dist") not permitted in develop' >&2 + exit 1 +fi diff --git a/.travis/prevent-base-master.sh b/.travis/prevent-base-master.sh new file mode 100755 index 00000000..54536a66 --- /dev/null +++ b/.travis/prevent-base-master.sh @@ -0,0 +1,5 @@ +#!/bin/bash +if [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ $TRAVIS_BRANCH == "master" ] && $(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -q "^src/"); then + echo 'The base branch for pull requests must be "develop"' >&2 + exit 1 +fi |