Skip to content

Commit f0d6330

Browse files
committed
Skip Desktop Tests on linux/aarch64
JavaFX `21.x.x` ships with `x86_64` versions of `libprism_es2.so` and `libprism_s2.so` shared objects. This causes desktop tests to fail on `linux/aarch64`. Instead of skipping all tests (`-x test`), just skip the Desktop tests.
1 parent 9ac96e0 commit f0d6330

File tree

1 file changed

+18
-21
lines changed

1 file changed

+18
-21
lines changed

.github/workflows/build.yml

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,14 @@ jobs:
1818
include:
1919
- os: ubuntu-22.04
2020
arch: x86_64
21-
skip_tests: false
2221
- os: ubuntu-22.04-arm
2322
arch: aarch64
24-
# JavaFX 21.x.x doesn't support `linux/aarch64`
25-
# So skip tests until JavaFX is updated
26-
skip_tests: true
2723
- os: macos-13
2824
arch: x86_64
29-
skip_tests: false
3025
- os: macos-15
3126
arch: aarch64
32-
skip_tests: false
3327
- os: windows-latest
3428
arch: x86_64
35-
skip_tests: false
3629
fail-fast: false
3730
runs-on: ${{ matrix.os }}
3831
steps:
@@ -46,15 +39,17 @@ jobs:
4639
distribution: 'adopt'
4740
cache: gradle
4841
- name: Build with Gradle with tests
49-
if: matrix.skip_tests == false
42+
if: ${{ !(runner.os == 'Linux' && matrix.arch == 'aarch64') }}
5043
run: ./gradlew build --stacktrace --scan
51-
- name: Build with Gradle without tests
52-
if: matrix.skip_tests == true
44+
- name: Build with Gradle, skip Desktop tests
45+
# JavaFX 21.x.x doesn't support `linux/aarch64`
46+
# So skip Desktop tests until JavaFX is updated
47+
if: ${{ (runner.os == 'Linux' && matrix.arch == 'aarch64') }}
5348
run: |
54-
./gradlew build --stacktrace --scan -x test
55-
echo "::warning title=Tests Skipped::Tests were intentionally skipped for linux/aarch64 builds \
56-
as JavaFX 21.x.x doesn't currently support the linux/aarch64 architecture. \
57-
This should be revisited when JavaFX is next updated."
49+
./gradlew build --stacktrace --scan -x desktop:test
50+
echo "::warning title=Desktop Tests Skipped::Desktop tests (desktop:test) were \
51+
intentionally skipped for linux/aarch64 builds as JavaFX 21.x.x doesn't currently support \
52+
the linux/aarch64 architecture. This should be revisited when JavaFX is next updated."
5853
- uses: actions/upload-artifact@v4
5954
if: failure()
6055
with:
@@ -80,16 +75,18 @@ jobs:
8075
.\wix314.exe /quiet /norestart
8176
shell: powershell
8277
- name: Build Haveno Installer with tests
83-
if: matrix.skip_tests == false
78+
if: ${{ !(runner.os == 'Linux' && matrix.arch == 'aarch64') }}
8479
run: ./gradlew clean build --refresh-keys --refresh-dependencies
8580
working-directory: .
86-
- name: Build Haveno Installer without tests
87-
if: matrix.skip_tests == true
81+
- name: Build Haveno Installer, skip Desktop tests
82+
# JavaFX 21.x.x doesn't support `linux/aarch64`
83+
# So skip Desktop tests until JavaFX is updated
84+
if: ${{ (runner.os == 'Linux' && matrix.arch == 'aarch64') }}
8885
run: |
89-
./gradlew clean build --refresh-keys --refresh-dependencies -x test
90-
echo "::warning title=Tests Skipped::Tests were intentionally skipped for linux/aarch64 builds \
91-
as JavaFX 21.x.x doesn't currently support the linux/aarch64 architecture. \
92-
This should be revisited when JavaFX is next updated."
86+
./gradlew clean build --refresh-keys --refresh-dependencies -x desktop:test
87+
echo "::warning title=Desktop Tests Skipped::Desktop tests (desktop:test) were \
88+
intentionally skipped for linux/aarch64 builds as JavaFX 21.x.x doesn't currently support \
89+
the linux/aarch64 architecture. This should be revisited when JavaFX is next updated."
9390
working-directory: .
9491
- name: Package Haveno Installer
9592
run: ./gradlew packageInstallers

0 commit comments

Comments
 (0)