Skip to content

Commit ff514e8

Browse files
committed
[Build] Improve elements order in maven.yml and build with Maven 3.9.9
1 parent f5e534a commit ff514e8

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.github/workflows/maven.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jobs:
2323
name: Event File
2424
path: ${{ github.event_path }}
2525
build:
26-
runs-on: ${{ matrix.config.os }}
2726
strategy:
2827
fail-fast: false
2928
matrix:
@@ -34,21 +33,22 @@ jobs:
3433
- { name: MacOS x86, os: macos-13, native: cocoa.macosx.x86_64 }
3534
- { name: MacOS ARM, os: macos-latest, native: cocoa.macosx.aarch64 }
3635
name: Verify ${{ matrix.config.name }} with Java-${{ matrix.java }}
36+
runs-on: ${{ matrix.config.os }}
3737
steps:
3838
- name: checkout swt
3939
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
4040
with:
4141
fetch-depth: 0 # required for jgit timestamp provider to work
4242
lfs: false # lfs-pull is not necessary, the natives are re-build in each run
4343
- name: Install Linux requirements
44+
if: ${{ matrix.config.native == 'gtk.linux.x86_64'}}
4445
run: |
4546
sudo apt-get update -qq
4647
sudo apt-get install -qq -y libgtk-3-dev freeglut3-dev webkit2gtk-driver
47-
if: ${{ matrix.config.native == 'gtk.linux.x86_64'}}
4848
- name: Pull large static Windows binaries
49+
if: ${{ matrix.config.native == 'win32.win32.x86_64'}}
4950
run: |
5051
git lfs pull --include='/binaries/org.eclipse.swt.win32.win32.x86_64/WebView2Loader.dll'
51-
if: ${{ matrix.config.native == 'win32.win32.x86_64'}}
5252
- name: Set up Java ${{ matrix.java }}
5353
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
5454
with:
@@ -58,8 +58,8 @@ jobs:
5858
- name: Set up Maven
5959
uses: stCarolas/setup-maven@v5
6060
with:
61-
maven-version: 3.9.6
62-
- name: Build with Maven
61+
maven-version: 3.9.9
62+
- name: Build
6363
uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
6464
with:
6565
run: >-
@@ -79,6 +79,7 @@ jobs:
7979
if: contains(github.event.pull_request.labels.*.name, 'performance')
8080
uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
8181
with:
82+
working-directory: tests/org.eclipse.swt.tests
8283
run: >-
8384
mvn --batch-mode -V -U -e
8485
-DforkCount=1
@@ -88,7 +89,6 @@ jobs:
8889
-DfailIfNoTests=true
8990
-Dtest=PerformanceTests
9091
integration-test
91-
working-directory: tests/org.eclipse.swt.tests
9292
- name: Upload Test Results for ${{ matrix.config.name }} / Java-${{ matrix.java }}
9393
if: always()
9494
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3

0 commit comments

Comments
 (0)