diff --git a/.travis.yml b/.travis.yml index c8dfa2b73bb..a09b88639b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,7 +67,7 @@ before_script: - "sh -e /etc/init.d/xvfb start" - mkdir -p $LOGS_DIR - npm run tslint - - "node ./scripts/ci/analyze-commits.js" + - "node ./scripts/ci/forbidden-identifiers.js" script: diff --git a/scripts/ci/analyze-commits.js b/scripts/ci/forbidden-identifiers.js similarity index 79% rename from scripts/ci/analyze-commits.js rename to scripts/ci/forbidden-identifiers.js index f2cdf51015a..854d07215a8 100644 --- a/scripts/ci/analyze-commits.js +++ b/scripts/ci/forbidden-identifiers.js @@ -16,15 +16,18 @@ var blocked_statements = [ ]; var blockedRegex = new RegExp('\\+.*(' + blocked_statements.join('|') + ').*$', 'mg'); +var commit_range = process.env.TRAVIS_COMMIT_RANGE || 'HEAD~1'; -var diff = child_process.execSync('git diff --unified=0 HEAD~1 ./src ./e2e').toString(); -var isInvalid = blockedRegex.test(diff); +var diff = child_process.execSync(`git diff --unified=0 ${commit_range} ./src ./e2e`).toString(); + +if (blockedRegex.test(diff)) { -if (isInvalid) { console.warn('Warning: You are using a statement in your commit, which is not allowed.\n' + 'Blocked Statements are: ' + blocked_statements.join(', ') + '\n' + 'Please remove them, and the CI will continue.'); + process.exit(1); + } else { console.log('Info: The commits have been analyzed and are valid!'); } \ No newline at end of file