File tree Expand file tree Collapse file tree 2 files changed +11
-8
lines changed Expand file tree Collapse file tree 2 files changed +11
-8
lines changed Original file line number Diff line number Diff line change @@ -47,7 +47,7 @@ matrix:
47
47
- env : CHROME=1 TASK=test_chrome
48
48
<< : *java
49
49
<< : *chrome
50
- - env : TASK ="//javascript/atoms:atoms //javascript/webdriver:all_js //javascript/ie-driver:atoms //javascript/chrome-driver:atoms //javascript/android-atoms:atoms ios_driver"
50
+ - env : BUCK ="//javascript/atoms:atoms //javascript/webdriver:all_js //javascript/ie-driver:atoms //javascript/chrome-driver:atoms //javascript/android-atoms:atoms ios_driver"
51
51
<< : *java
52
52
- env : TOXENV=flake8
53
53
<< : *python
@@ -66,14 +66,16 @@ matrix:
66
66
<< : *python
67
67
<< : *firefox-nightly
68
68
include :
69
- - env : BUCK="build selenium-server-standalone java-small-tests chrome-test firefox-test legacy-firefox-test grid-test htmlunit-test ie-test opera-test java-tests"
69
+ - env : TASK="calcdeps"
70
+ << : *java
71
+ - env : BUCK="build selenium-server-standalone java-small-tests chrome-test firefox-test legacy-firefox-test grid-test htmlunit-test ie-test opera-test java-small-tests"
70
72
<< : *java
71
73
- env : BUCK="test //java/client/test/org/openqa/selenium/atoms:test"
72
74
<< : *java
73
- - env : CHROME=1 TASK="calcdeps //javascript/atoms:atoms-chrome:run //javascript/selenium-atoms:selenium-atoms-chrome:run //javascript/selenium-core:selenium-core-chrome:run //javascript/webdriver:webdriver-chrome:run "
75
+ - 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"
74
76
<< : *java
75
77
<< : *chrome
76
- - env : MARIONETTE=1 TASK="calcdeps //javascript/atoms:atoms-firefox:run //javascript/webdriver:webdriver-firefox:run //javascript/selenium-atoms:selenium-atoms-firefox:run //javascript/selenium-core:selenium-core-firefox:run "
78
+ - env : MARIONETTE=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"
77
79
<< : *java
78
80
<< : *firefox-latest
79
81
- env : BUCK="test legacy-firefox-test"
Original file line number Diff line number Diff line change @@ -12,10 +12,11 @@ if [[ ! -z $TOXENV ]]; then
12
12
tox -c py/tox.ini
13
13
fi
14
14
15
- if [[ ! -z " $BUCK " ]]; then
16
- ./buckw $BUCK
17
- fi
18
-
15
+ # Ordering matters here. We want rake tasks to run first
19
16
if [[ ! -z $TASK ]]; then
20
17
./go $TASK
21
18
fi
19
+
20
+ if [[ ! -z " $BUCK " ]]; then
21
+ ./buckw $BUCK
22
+ fi
You can’t perform that action at this time.
0 commit comments