Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 9cce1a3

Browse files
committed
chore: add new job that runs ci-checks
1 parent 241ce8c commit 9cce1a3

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

Diff for: .travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ branches:
1515

1616
env:
1717
matrix:
18+
- JOB=ci-checks
1819
- JOB=unit BROWSER_PROVIDER=saucelabs
1920
- JOB=docs-e2e BROWSER_PROVIDER=saucelabs
2021
- JOB=e2e TEST_TARGET=jqlite BROWSER_PROVIDER=saucelabs

Diff for: Gruntfile.js

-1
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,6 @@ module.exports = function(grunt) {
355355
grunt.registerTask('minify', ['bower','clean', 'build', 'minall']);
356356
grunt.registerTask('webserver', ['connect:devserver']);
357357
grunt.registerTask('package', ['bower','clean', 'buildall', 'minall', 'collect-errors', 'docs', 'copy', 'write', 'compress']);
358-
grunt.registerTask('ci-pre-checks', ['ddescribe-iit', 'merge-conflict', 'jshint']);
359358
grunt.registerTask('ci-checks', ['ddescribe-iit', 'merge-conflict', 'jshint', 'jscs']);
360359
grunt.registerTask('default', ['package']);
361360
};

Diff for: scripts/travis/build.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ set -e
55
export BROWSER_STACK_ACCESS_KEY=`echo $BROWSER_STACK_ACCESS_KEY | rev`
66
export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
77

8-
if [ $JOB = "unit" ]; then
8+
if [ $JOB = "ci-checks"]; then
9+
grunt ci-checks;
10+
elif [ $JOB = "unit" ]; then
911
if [ "$BROWSER_PROVIDER" == "browserstack" ]; then
1012
BROWSERS="BS_Chrome,BS_Safari,BS_Firefox,BS_IE_9,BS_IE_10,BS_IE_11,BS_iOS"
1113
else
1214
BROWSERS="SL_Chrome,SL_Safari,SL_Firefox,SL_IE_9,SL_IE_10,SL_IE_11,SL_iOS"
1315
fi
1416

15-
grunt ci-pre-checks
1617
grunt test:promises-aplus
1718
grunt test:unit --browsers $BROWSERS --reporters dots
18-
grunt jscs
1919
grunt tests:docs --browsers $BROWSERS --reporters dots
2020
elif [ $JOB = "docs-e2e" ]; then
2121
grunt test:travis-protractor --specs "docs/app/e2e/**/*.scenario.js"

Diff for: scripts/travis/start_browser_provider.sh

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
#!/bin/bash
22
# Has to be run from project root directory.
33

4+
if ["$JOB" != "ci-checks" ]; then
5+
if [ "$BROWSER_PROVIDER" == "browserstack" ]; then
6+
echo "Using BrowserStack"
7+
elif [ "$BROWSER_PROVIDER" == "saucelabs" ]; then
8+
echo "Using SauceLabs"
9+
else
10+
echo "Invalid BROWSER_PROVIDER. Please set env var BROWSER_PROVIDER to 'saucelabs' or 'browserstack'."
11+
exit 1
12+
fi
413

5-
if [ "$BROWSER_PROVIDER" == "browserstack" ]; then
6-
echo "Using BrowserStack"
7-
elif [ "$BROWSER_PROVIDER" == "saucelabs" ]; then
8-
echo "Using SauceLabs"
9-
else
10-
echo "Invalid BROWSER_PROVIDER. Please set env var BROWSER_PROVIDER to 'saucelabs' or 'browserstack'."
11-
exit 1
14+
./lib/${BROWSER_PROVIDER}/start_tunnel.sh
1215
fi
13-
14-
./lib/${BROWSER_PROVIDER}/start_tunnel.sh

0 commit comments

Comments
 (0)