Skip to content

Commit

Permalink
Migrating more travis jobs from buck to bazel
Browse files Browse the repository at this point in the history
  • Loading branch information
barancev committed Sep 4, 2019
1 parent b723512 commit c64063f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 25 deletions.
11 changes: 3 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ 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: CHROME=1 BUCK="test chrome-test"
<<: *java
<<: *chrome
- env: TOXENV=flake8
<<: *python
- env: TOXENV=docs
Expand Down Expand Up @@ -98,14 +95,12 @@ matrix:
<<: *chrome
- env: BZL="test --test_tag_filters=htmlunit //java/..."
<<: *java
- env: CHROME=1 TASK="calcdeps" BUCK="test //javascript/atoms:atoms-chrome //javascript/selenium-atoms:selenium-atoms-chrome //javascript/selenium-core:selenium-core-chrome //javascript/webdriver:webdriver-chrome"
<<: *java
<<: *chrome
- env: MARIONETTE=1 MOZ_HEADLESS=1 TASK="calcdeps" BUCK="test //javascript/atoms:atoms-firefox //javascript/webdriver:webdriver-firefox //javascript/selenium-atoms:selenium-atoms-firefox //javascript/selenium-core:selenium-core-firefox"
- 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/selenium-core:test-firefox //javascript/webdriver:test-firefox"
<<: *java
<<: *firefox-latest
- env: MARIONETTE=1 BUCK="test --labels small --always-exclude //java/..."
- env: CHROME=1 TASK="calcdeps" BZL="test --test_env=DISPLAY --test_env=TRAVIS //javascript/atoms:test-chrome //javascript/selenium-atoms:test-chrome //javascript/selenium-core:test-chrome //javascript/webdriver:test-chrome"
<<: *java
<<: *chrome
- env: TASK=javadocs
<<: *java
- env: TOXENV=py27-unit
Expand Down
3 changes: 0 additions & 3 deletions scripts/travis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,5 @@ fi

echo -e "[ui]\n superconsole = disabled\n" >> .buckconfig.local

# buckw uses requests to download buck executable
pip install requests

curl -L -o bazelisk "https://github.com/bazelbuild/bazelisk/releases/download/v1.0/bazelisk-linux-amd64"
chmod +x bazelisk && sudo mv bazelisk /usr/local/bin/bazel
14 changes: 0 additions & 14 deletions scripts/travis/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,6 @@ if [[ ! -z $TASK ]]; then
fi
fi

if [[ ! -z "$BUCK" ]]; then
if [[ $BUCK == test\ //javascript/* ]]; then
if [[ $TRAVIS_PULL_REQUEST == "false" ]] || git diff --name-only HEAD~1| grep '^javascript/' >/dev/null; then
./buckw $BUCK
fi
elif [[ $BUCK == test\ * ]]; then
if [[ $TRAVIS_PULL_REQUEST == "false" ]] || git diff --name-only HEAD~1| grep '^java/' >/dev/null; then
./buckw $BUCK
fi
else
./buckw $BUCK
fi
fi

if [[ ! -z "$BZL" ]]; then
if [[ $BZL == test\ //javascript/* ]]; then
if [[ $TRAVIS_PULL_REQUEST == "false" ]] || git diff --name-only HEAD~1| grep '^javascript/' >/dev/null; then
Expand Down

0 comments on commit c64063f

Please sign in to comment.