Merge main into system-file-chooser

This commit is contained in:
Karl Tauber
2025-01-23 17:04:05 +01:00
9 changed files with 60 additions and 42 deletions

View File

@@ -21,27 +21,24 @@ jobs:
strategy:
matrix:
os:
- windows
- macos
- ubuntu
- windows-latest
- macos-latest
- ubuntu-latest
- ubuntu-24.04-arm
runs-on: ${{ matrix.os }}-latest
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: gradle/actions/wrapper-validation@v4
- name: install libxt-dev
if: matrix.os == 'ubuntu'
run: sudo apt install libxt-dev
- name: install libgtk-3-dev
if: matrix.os == 'ubuntu'
run: sudo apt install libgtk-3-dev
- name: install libxt-dev and libgtk-3-dev
if: matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-24.04-arm'
run: sudo apt install libxt-dev libgtk-3-dev
- name: Download libgtk-3.so for arm64
if: matrix.os == 'ubuntu'
if: matrix.os == 'ubuntu-latest'
working-directory: flatlaf-natives/flatlaf-natives-linux/lib/aarch64
run: |
pwd
@@ -54,7 +51,7 @@ jobs:
ls -l
- name: install g++-aarch64-linux-gnu
if: matrix.os == 'ubuntu'
if: matrix.os == 'ubuntu-latest'
run: sudo apt install g++-aarch64-linux-gnu
- name: Setup Java 11