Skip to content

Commit 39623fa

Browse files
committed
[java] Splitting browser tests per OS and remote only in macOS
1 parent a684ab6 commit 39623fa

File tree

1 file changed

+31
-26
lines changed

1 file changed

+31
-26
lines changed

.github/workflows/ci-java.yml

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,49 @@ on:
55
workflow_dispatch:
66

77
jobs:
8-
browser-tests:
8+
browser-tests-windows:
99
name: Browser Tests
1010
uses: ./.github/workflows/bazel.yml
1111
strategy:
1212
fail-fast: false
1313
matrix:
1414
include:
1515
- os: windows
16+
with:
17+
name: Browser Tests (chrome, ${{ matrix.os }})
18+
os: ${{ matrix.os }}
19+
browser: chrome
20+
cache-key: java-${{ matrix.os }}-tests
21+
run: |
22+
bazel test //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest ^
23+
//java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest ^
24+
//java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest ^
25+
//java/test/org/openqa/selenium/grid/gridui:OverallGridTest ^
26+
//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest ^
27+
//java/test/org/openqa/selenium/remote:RemoteWebDriverBuilderTest ^
28+
//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest
29+
30+
browser-tests-macos:
31+
name: Browser Tests
32+
uses: ./.github/workflows/bazel.yml
33+
strategy:
34+
fail-fast: false
35+
matrix:
36+
include:
1637
- os: macos
1738
with:
1839
name: Browser Tests (chrome, ${{ matrix.os }})
1940
os: ${{ matrix.os }}
2041
browser: chrome
2142
cache-key: java-${{ matrix.os }}-tests
2243
run: |
23-
if [[ "${{ matrix.os }}" == "windows" ]]; then
24-
bazel test //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest ^
25-
//java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest ^
26-
//java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest ^
27-
//java/test/org/openqa/selenium/grid/gridui:OverallGridTest ^
28-
//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest ^
29-
//java/test/org/openqa/selenium/remote:RemoteWebDriverBuilderTest ^
30-
//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest
31-
else
32-
bazel test //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest-remote \
33-
//java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest \
34-
//java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest \
35-
//java/test/org/openqa/selenium/grid/gridui:OverallGridTest \
36-
//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest \
37-
//java/test/org/openqa/selenium/remote:RemoteWebDriverBuilderTest \
38-
//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest
39-
fi
44+
bazel test //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest-remote \
45+
//java/test/org/openqa/selenium/federatedcredentialmanagement:FederatedCredentialManagementTest \
46+
//java/test/org/openqa/selenium/firefox:FirefoxDriverBuilderTest \
47+
//java/test/org/openqa/selenium/grid/gridui:OverallGridTest \
48+
//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest \
49+
//java/test/org/openqa/selenium/remote:RemoteWebDriverBuilderTest \
50+
//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest
4051
4152
remote-tests:
4253
name: Remote Tests
@@ -45,18 +56,12 @@ jobs:
4556
fail-fast: false
4657
matrix:
4758
include:
48-
- os: windows
4959
- os: macos
5060
with:
5161
name: Remote Tests (chrome, ${{ matrix.os }})
5262
os: ${{ matrix.os }}
5363
browser: chrome
5464
cache-key: java-${{ matrix.os }}-remote-tests
5565
run: |
56-
if [[ "${{ matrix.os }}" == "windows" ]]; then
57-
bazel test //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest-remote ^
58-
//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest-remote
59-
else
60-
bazel test //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest-remote \
61-
//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest-remote
62-
fi
66+
bazel test //java/test/org/openqa/selenium/chrome:ChromeDriverFunctionalTest-remote \
67+
//java/test/org/openqa/selenium/grid/router:RemoteWebDriverDownloadTest-remote

0 commit comments

Comments
 (0)