Skip to content

Commit

Permalink
Refactoring scripts to run tests with bazel on travis
Browse files Browse the repository at this point in the history
  • Loading branch information
barancev committed Sep 5, 2019
1 parent bc2639e commit 13f42ac
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 8 deletions.
14 changes: 6 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ cache:

matrix:
exclude:
- env: BUCK="//javascript/atoms:atoms //javascript/webdriver:all_js //javascript/ie-driver:atoms //javascript/chrome-driver:atoms //javascript/android-atoms:atoms ios_driver"
<<: *java
- env: TOXENV=flake8
<<: *python
- env: TOXENV=docs
Expand Down Expand Up @@ -85,20 +83,20 @@ matrix:
<<: *firefox-latest
- env: BZL="build //java/..."
<<: *java
- env: BZL="test --test_size_filters=small //java/..."
- env: BZL_TEST="--test_size_filters=small //java/..."
<<: *java
- env: MARIONETTE=1 BZL="test --test_tag_filters=firefox --test_env=DISPLAY --test_env=TRAVIS //java/..."
- env: MARIONETTE=1 BZL_TEST="--test_tag_filters=firefox //java/..."
<<: *java
<<: *firefox-nightly
- env: CHROME=1 BZL="test --test_tag_filters=chrome --test_env=DISPLAY --test_env=TRAVIS //java/..."
- env: CHROME=1 BZL_TEST="--test_tag_filters=chrome //java/..."
<<: *java
<<: *chrome
- env: BZL="test --test_tag_filters=htmlunit //java/..."
- env: BZL_TEST="--test_tag_filters=htmlunit //java/..."
<<: *java
- env: MARIONETTE=1 MOZ_HEADLESS=1 TASK="calcdeps" BZL="test --test_env=DISPLAY --test_env=TRAVIS //javascript/atoms:test-firefox //javascript/selenium-atoms:test-firefox //javascript/webdriver:test-firefox"
- env: MARIONETTE=1 MOZ_HEADLESS=1 TASK="calcdeps" BZL_TEST="//javascript/atoms:test-firefox //javascript/selenium-atoms:test-firefox //javascript/webdriver:test-firefox"
<<: *java
<<: *firefox-latest
- env: CHROME=1 TASK="calcdeps" BZL="test --test_env=DISPLAY --test_env=TRAVIS //javascript/atoms:test-chrome //javascript/selenium-atoms:test-chrome //javascript/webdriver:test-chrome"
- env: CHROME=1 TASK="calcdeps" BZL_TEST="//javascript/atoms:test-chrome //javascript/selenium-atoms:test-chrome //javascript/webdriver:test-chrome"
<<: *java
<<: *chrome
- env: TASK=javadocs
Expand Down
14 changes: 14 additions & 0 deletions scripts/travis/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,20 @@ if [[ ! -z "$BZL" ]]; then
fi
fi

if [[ ! -z "$BZL_TEST" ]]; then
if [[ $BZL_TEST == test\ //javascript/* ]]; then
if [[ $TRAVIS_PULL_REQUEST == "false" ]] || git diff --name-only HEAD~1| grep '^javascript/' >/dev/null; then
bazel test --test_env=TRAVIS --test_env=DISPLAY --test_env=DASHBOARD_URL $BZL_TEST
fi
elif [[ $BZL_TEST == test\ * ]]; then
if [[ $TRAVIS_PULL_REQUEST == "false" ]] || git diff --name-only HEAD~1| grep '^java/' >/dev/null; then
bazel test --test_env=TRAVIS --test_env=DISPLAY --test_env=DASHBOARD_URL $BZL_TEST
fi
else
bazel test --test_env=TRAVIS --test_env=DISPLAY --test_env=DASHBOARD_URL $BZL
fi
fi

if [[ ! -z "$NPM" ]]; then
if [[ $TRAVIS_PULL_REQUEST == "false" ]] || git diff --name-only HEAD~1| grep '^javascript/' >/dev/null; then
./go node:atoms
Expand Down

0 comments on commit 13f42ac

Please sign in to comment.