From ec320998c2ec2f2c44604cc7e3f29cb54c3f6f87 Mon Sep 17 00:00:00 2001 From: Alex Osborne Date: Thu, 12 Nov 2026 13:19:14 +0900 Subject: [PATCH] CI: run the browser tests in their own job against Firefox and Chrome --- .github/workflows/maven.yml | 40 +++++++++++++++++-- .../processor/BrowserProcessorTest.java | 3 +- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 76a6f474..0ba03edf 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -31,12 +31,46 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - name: Show Firefox version - run: firefox --version - name: Build with Maven - run: mvn -B package --file pom.xml -DrunBrowserTests=true + run: mvn -B package --file pom.xml env: # Apparently Azure kills idle http connections after 4 minutes which can cause the build to fail # with a timeout error. Limit the connection ttl to 2 minutes to workaround this as per # https://github.com/actions/virtual-environments/issues/1499 MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=3 + + browser-tests: + name: browser-tests (${{ matrix.browser }}) + strategy: + fail-fast: false + matrix: + include: + - browser: firefox + executable: firefox + - browser: chrome + executable: $CHROMEWEBDRIVER/chromedriver + runs-on: ubuntu-latest + timeout-minutes: 30 + + steps: + - uses: actions/checkout@v7 + - name: Set up JDK 21 + uses: actions/setup-java@v6.1.0 + with: + java-version: 21 + distribution: 'temurin' + - name: Cache local Maven repository + uses: actions/cache@v6 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Show browser version + run: ${{ matrix.executable }} --version + - name: Run browser tests + run: >- + mvn -B -pl commons,engine -am test -Dtest=BrowserProcessorTest -Dsurefire.failIfNoSpecifiedTests=false + -DrunBrowserTests=true -DbrowserExecutable=${{ matrix.executable }} + env: + MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=3 diff --git a/engine/src/test/java/org/archive/crawler/processor/BrowserProcessorTest.java b/engine/src/test/java/org/archive/crawler/processor/BrowserProcessorTest.java index e88b4516..3d3896c2 100644 --- a/engine/src/test/java/org/archive/crawler/processor/BrowserProcessorTest.java +++ b/engine/src/test/java/org/archive/crawler/processor/BrowserProcessorTest.java @@ -332,7 +332,8 @@ class BrowserProcessorTest { })); crawlController.setDispositionChain(dispositionChain); browserProcessor = new BrowserProcessor(fetcher, crawlController, event -> {}, null); - browserProcessor.start(); + browserProcessor.setExecutable(System.getProperty("browserExecutable")); + browserProcessor.start(); } @AfterAll