From 3ea2f8ea40b3b2098fb7aaa72e7a2210c2ac8597 Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Tue, 26 Nov 2024 12:46:05 +0100 Subject: [PATCH 1/8] Run headless tests --- rta/pom.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 9 deletions(-) diff --git a/rta/pom.xml b/rta/pom.xml index 7d15c26..77673b1 100644 --- a/rta/pom.xml +++ b/rta/pom.xml @@ -18,6 +18,7 @@ 23.0.1 3.2.7 1.1.0 + @@ -37,16 +38,36 @@ offline ${emoji.version} + + org.junit.jupiter junit-jupiter-engine 5.11.3 test + + org.testfx + testfx-core + 4.0.19-gluon-SNAPSHOT + test + org.testfx testfx-junit5 - 4.0.18 + 4.0.19-gluon-SNAPSHOT + test + + + org.hamcrest + hamcrest + 3.0 + test + + + org.assertj + assertj-core + 3.26.3 test @@ -150,7 +171,7 @@ 3.5.2 false - --add-opens javafx.graphics/com.sun.javafx.application=ALL-UNNAMED + -Dtestfx.headless=true --add-opens javafx.graphics/com.sun.javafx.application=ALL-UNNAMED java.util.logging.config.file @@ -158,13 +179,6 @@ - - - org.junit.jupiter - junit-jupiter-engine - 5.11.3 - - @@ -210,5 +224,31 @@ + + test + + + org.openjfx + javafx-base + ${javafx.version} + system + ${javafx.systemPath}/javafx.base.jar + + + org.openjfx + javafx-graphics + ${javafx.version} + system + ${javafx.systemPath}/javafx.graphics.jar + + + org.openjfx + javafx-controls + ${javafx.version} + system + ${javafx.systemPath}/javafx.controls.jar + + + From 3e49a62b72add65165e06dcae724a158df5c179b Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Tue, 26 Nov 2024 12:51:43 +0100 Subject: [PATCH 2/8] add repository --- rta/pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/rta/pom.xml b/rta/pom.xml index 77673b1..57e15f9 100644 --- a/rta/pom.xml +++ b/rta/pom.xml @@ -128,6 +128,17 @@ + + + Gluon Releases + https://nexus.gluonhq.com/nexus/content/repositories/releases/ + + + Gluon Snapshots + https://nexus.gluonhq.com/nexus/content/repositories/public-snapshots/ + + + From c727148704df8f4d3dc406bc8ba56c08dccccdc1 Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Tue, 26 Nov 2024 12:56:00 +0100 Subject: [PATCH 3/8] don't set platform yet --- rta/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rta/pom.xml b/rta/pom.xml index 57e15f9..44aa23f 100644 --- a/rta/pom.xml +++ b/rta/pom.xml @@ -182,7 +182,7 @@ 3.5.2 false - -Dtestfx.headless=true --add-opens javafx.graphics/com.sun.javafx.application=ALL-UNNAMED + --add-opens javafx.graphics/com.sun.javafx.application=ALL-UNNAMED java.util.logging.config.file From 57ebc54a9e4b377e30c9b8ce1b417f35db870610 Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Sat, 30 Nov 2024 12:39:07 +0100 Subject: [PATCH 4/8] Run GitHub tests headlesslly --- .github/workflows/build.yml | 39 +++++++++++++++++++++++-------------- rta/pom.xml | 30 +++++++++++----------------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 99a8138..52c603c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,32 +15,41 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Setup Java + - name: Setup java (tests) uses: actions/setup-java@v4 with: - java-version: 21 distribution: 'oracle' + java-version: '22' cache: 'maven' - server-id: ossrh - server-username: MAVEN_USERNAME - server-password: MAVEN_CENTRAL_TOKEN + server-id: 'OpenJFX Test Builds' + server-username: NEXUS_USERNAME + server-password: NEXUS_PASSWORD - - name: Build project (macOS) - if: runner.os == 'macOS' + - name: Build project (Linux/macOS) + if: runner.os != 'Windows' run: | - ./mvnw -B -ntp verify -f rta + ./mvnw -B -ntp -Ptest verify -f rta + env: + NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }} + NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} - name: Build project (Windows) if: runner.os == 'Windows' run: | - .\mvnw -B -ntp verify -f rta + .\mvnw -B -ntp -Ptest verify -f rta + env: + NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }} + NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} - - name: Build project (Linux) - if: runner.os == 'Linux' - run: | - export DISPLAY=:90 - Xvfb -ac :90 -screen 0 1280x1024x24 > /dev/null 2>&1 & - ./mvnw -B -ntp verify -f rta + - name: Setup Java (distribution) + uses: actions/setup-java@v4 + with: + java-version: 21 + distribution: 'oracle' + cache: 'maven' + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_CENTRAL_TOKEN - name: Publish Snapshots if: github.ref == 'refs/heads/main' && runner.os == 'Linux' diff --git a/rta/pom.xml b/rta/pom.xml index 44aa23f..7ee897e 100644 --- a/rta/pom.xml +++ b/rta/pom.xml @@ -18,7 +18,8 @@ 23.0.1 3.2.7 1.1.0 - + + 24-headless+0-2024-11-30-072408 @@ -137,6 +138,10 @@ Gluon Snapshots https://nexus.gluonhq.com/nexus/content/repositories/public-snapshots/ + + OpenJFX Test Builds + https://nexus.gluonhq.com/nexus/content/repositories/openjfx-test + @@ -182,7 +187,7 @@ 3.5.2 false - --add-opens javafx.graphics/com.sun.javafx.application=ALL-UNNAMED + ${test.headless} --add-opens javafx.graphics/com.sun.javafx.application=ALL-UNNAMED java.util.logging.config.file @@ -237,27 +242,14 @@ test + + -Dtestfx.headless=true + - - org.openjfx - javafx-base - ${javafx.version} - system - ${javafx.systemPath}/javafx.base.jar - - - org.openjfx - javafx-graphics - ${javafx.version} - system - ${javafx.systemPath}/javafx.graphics.jar - org.openjfx javafx-controls - ${javafx.version} - system - ${javafx.systemPath}/javafx.controls.jar + ${test.javafx.version} From ed249610ee96ad6a8e01d57b8b5ee845a83efa36 Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Sat, 30 Nov 2024 12:58:25 +0100 Subject: [PATCH 5/8] server-id --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 52c603c..3ccc41a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,6 +25,9 @@ jobs: server-username: NEXUS_USERNAME server-password: NEXUS_PASSWORD + - name: Log Settings.xml + run: cat ~/.m2/settings.xml + - name: Build project (Linux/macOS) if: runner.os != 'Windows' run: | From 868a89c168938f50804bcafcfe54a4c207c588e7 Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Sat, 30 Nov 2024 13:09:41 +0100 Subject: [PATCH 6/8] remove log --- .github/workflows/build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3ccc41a..52c603c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,9 +25,6 @@ jobs: server-username: NEXUS_USERNAME server-password: NEXUS_PASSWORD - - name: Log Settings.xml - run: cat ~/.m2/settings.xml - - name: Build project (Linux/macOS) if: runner.os != 'Windows' run: | From db6efa429273aff173df0bd0534d0fd3ae7c07c3 Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Wed, 4 Dec 2024 11:04:45 +0100 Subject: [PATCH 7/8] update headless platform --- .github/workflows/build.yml | 9 --------- .github/workflows/release.yml | 5 ++--- rta/pom.xml | 6 +----- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 52c603c..ed35ba8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,25 +21,16 @@ jobs: distribution: 'oracle' java-version: '22' cache: 'maven' - server-id: 'OpenJFX Test Builds' - server-username: NEXUS_USERNAME - server-password: NEXUS_PASSWORD - name: Build project (Linux/macOS) if: runner.os != 'Windows' run: | ./mvnw -B -ntp -Ptest verify -f rta - env: - NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }} - NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} - name: Build project (Windows) if: runner.os == 'Windows' run: | .\mvnw -B -ntp -Ptest verify -f rta - env: - NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }} - NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} - name: Setup Java (distribution) uses: actions/setup-java@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 71788a1..f88a310 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,9 +39,8 @@ jobs: - name: Publish to Maven Central id: deploy run: | - export DISPLAY=:90 - Xvfb -ac :90 -screen 0 1280x1024x24 > /dev/null 2>&1 & - ./mvnw -B -ntp -Prelease deploy -f rta + ./mvnw -B -ntp -Ptest verify -f rta + ./mvnw -B -Dmaven.test.skip=true -Prelease deploy -f rta echo ::set-output name=exit_code::$? env: MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }} diff --git a/rta/pom.xml b/rta/pom.xml index 7ee897e..90c2d37 100644 --- a/rta/pom.xml +++ b/rta/pom.xml @@ -19,7 +19,7 @@ 3.2.7 1.1.0 - 24-headless+0-2024-11-30-072408 + 24-headless+0-2024-12-02-101029 @@ -138,10 +138,6 @@ Gluon Snapshots https://nexus.gluonhq.com/nexus/content/repositories/public-snapshots/ - - OpenJFX Test Builds - https://nexus.gluonhq.com/nexus/content/repositories/openjfx-test - From 26532d6a701544f43a6b03048b1a57b8f1858948 Mon Sep 17 00:00:00 2001 From: "jose.pereda" Date: Thu, 5 Dec 2024 23:15:55 +0100 Subject: [PATCH 8/8] update workflows --- .github/workflows/build.yml | 17 +++++------------ .github/workflows/release.yml | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed35ba8..2e0e113 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,12 +15,15 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Setup java (tests) + - name: Setup Java uses: actions/setup-java@v4 with: + java-version: 22 distribution: 'oracle' - java-version: '22' cache: 'maven' + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_CENTRAL_TOKEN - name: Build project (Linux/macOS) if: runner.os != 'Windows' @@ -32,16 +35,6 @@ jobs: run: | .\mvnw -B -ntp -Ptest verify -f rta - - name: Setup Java (distribution) - uses: actions/setup-java@v4 - with: - java-version: 21 - distribution: 'oracle' - cache: 'maven' - server-id: ossrh - server-username: MAVEN_USERNAME - server-password: MAVEN_CENTRAL_TOKEN - - name: Publish Snapshots if: github.ref == 'refs/heads/main' && runner.os == 'Linux' run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f88a310..f3c1831 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,7 @@ jobs: - name: Setup Java and Apache Maven uses: actions/setup-java@v4 with: - java-version: 21 + java-version: 22 distribution: 'oracle' cache: 'maven' server-id: ossrh