Merge branch 'eclipse-platform:master' into master

Author: vogella

.github/workflows/build.yml

@@ -0,0 +1,98 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: "SWT Build"
+
+on:
+  workflow_call:
+    inputs:
+      runner:
+        description: "build.runs-on value"
+        type: string
+        required: true
+      java:
+        description: "Java version"
+        type: string
+        required: true
+      native:
+        description: "Native target identifier (one of gtk.linux.x86_64, win32.win32.x86_64, cocoa.macosx.x86_64, cocoa.macosx.aarch64)"
+        type: string
+        required: true
+      performance:
+        description: "Run performance tests too (one of true, false)"
+        type: boolean
+        required: false
+        default: false
+      runtodotests:
+        description: "Run TODO tagged tests too (one of true, false)"
+        type: boolean
+        required: false
+        default: false
+
+jobs:
+  build:
+    runs-on: ${{ inputs.runner }}
+    steps:
+    - name: checkout swt
+      uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v5.0.0
+      with:
+       fetch-depth: 0 # required for jgit timestamp provider to work
+       lfs: false # lfs-pull is not necessary, the natives are re-build in each run
+    - name: Install Linux requirements
+      if: ${{ inputs.native == 'gtk.linux.x86_64'}}
+      run: |
+        sudo apt-get update -qq
+        sudo apt-get install -qq -y libgtk-3-dev libgtk-4-dev freeglut3-dev webkit2gtk-driver
+    - name: Pull large static Windows binaries
+      if: ${{ inputs.native == 'win32.win32.x86_64'}}
+      run: |
+        git lfs pull --include='/binaries/org.eclipse.swt.win32.win32.x86_64/WebView2Loader.dll'
+    - name: Set up Java ${{ inputs.java }}
+      uses: actions/setup-java@de5a937a1dc73fbc1a67d7d1aa4bebc1082f3190 # v5.0.0
+      with:
+        java-version: ${{ inputs.java }}
+        distribution: 'temurin'
+        cache: maven
+    - name: Set up Maven
+      uses: stCarolas/setup-maven@v5
+      with:
+        maven-version: 3.9.11
+    - name: Build
+      env:
+        GTK_XCFLAGS: '-Wno-deprecated-declarations'
+      run: >-
+        ${{ contains(inputs.native, 'linux') && 'xvfb-run' || '' }}
+        mvn --batch-mode -V -U -e
+        --threads 1C
+        -DforkCount=1
+        '-Dnative=${{ inputs.native }}'
+        -Papi-check -Pjavadoc
+        '-Dtycho.baseline.replace=none'
+        --fail-at-end
+        -DskipNativeTests=false
+        -DfailIfNoTests=false
+        ${{ (inputs.runtodotests == false && contains(inputs.native, 'linux')) && '-DexcludedGroups=gtk3-todo' || '' }}
+        clean install
+    - name: Performance tests
+      if: ${{ inputs.performance }}
+      working-directory: tests/org.eclipse.swt.tests
+      run: >-
+        ${{ contains(inputs.native, 'linux') && 'xvfb-run' || '' }}
+        mvn --batch-mode -V -U -e
+        -DforkCount=1
+        --fail-at-end
+        -DskipNativeTests=true
+        -DfailIfNoTests=true
+        -Dtest=PerformanceTests
+        integration-test
+    - name: Upload Test Results
+      if: always()
+      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+      with:
+        name: test-results-${{ inputs.native }}-java${{ inputs.java }}
+        if-no-files-found: warn
+        path: |
+          ${{ github.workspace }}/**/target/surefire-reports/*.xml
+          ${{ github.workspace }}/**/*.log
+          ${{ github.workspace }}/**/*.dump
+          ${{ github.workspace }}/**/*.dumpstream

.github/workflows/maven.yml

@@ -1,5 +1,12 @@
-# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+# This is the main maven workflow for SWT.
+
+# You can run this locally to test changes with the act command https://nektosact.com/
+# For example, to run all linux tests on Java 21:
+#   act -j build-linux --matrix java:21 --artifact-server-path $PWD/.artifacts
+# You may need to download runners on first run, act will ask but if you
+# want the big runner there is no progress as it downloads, so you can pull it with
+# docker directly:
+#   docker pull catthehacker/ubuntu:full-latest
 
 name: SWT Matrix Build
 concurrency: 
@@ -26,76 +33,52 @@ jobs:
       with:
         name: Event File
         path: ${{ github.event_path }}
-  build:
+
+  build-linux:
+    name: Build (Linux)
     strategy:
       fail-fast: false
       matrix:
-        java: [ '21' ]
-        config: 
-          - { name: Linux, os: ubuntu-latest, native: gtk.linux.x86_64 }
-          - { name: Windows, os: windows-latest, native: win32.win32.x86_64 }
-          - { name: MacOS x86, os: macos-15-intel, native: cocoa.macosx.x86_64 }
-          - { name: MacOS ARM, os: macos-latest, native: cocoa.macosx.aarch64 }
-    name: Verify ${{ matrix.config.name }} with Java-${{ matrix.java }}
-    runs-on: ${{ matrix.config.os }}
-    steps:
-    - name: checkout swt
-      uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v5.0.0
-      with:
-       fetch-depth: 0 # required for jgit timestamp provider to work
-       lfs: false # lfs-pull is not necessary, the natives are re-build in each run
-    - name: Install Linux requirements
-      if: ${{ matrix.config.native == 'gtk.linux.x86_64'}}
-      run: |
-        sudo apt-get update -qq 
-        sudo apt-get install -qq -y libgtk-3-dev libgtk-4-dev freeglut3-dev webkit2gtk-driver
-    - name: Pull large static Windows binaries
-      if: ${{ matrix.config.native == 'win32.win32.x86_64'}}
-      run: |
-        git lfs pull --include='/binaries/org.eclipse.swt.win32.win32.x86_64/WebView2Loader.dll'
-    - name: Set up Java ${{ matrix.java }}
-      uses: actions/setup-java@de5a937a1dc73fbc1a67d7d1aa4bebc1082f3190 # v5.0.0
-      with:
-        java-version: ${{ matrix.java }}
-        distribution: 'temurin'
-        cache: maven
-    - name: Set up Maven
-      uses: stCarolas/setup-maven@v5
-      with:
-        maven-version: 3.9.11
-    - name: Build
-      env:
-        GTK_XCFLAGS: '-Wno-deprecated-declarations'
-      run: >-
-        ${{ contains(matrix.config.native, 'linux') && 'xvfb-run' || '' }}
-        mvn --batch-mode -V -U -e
-        --threads 1C
-        -DforkCount=1
-        '-Dnative=${{ matrix.config.native }}'
-        -Papi-check -Pjavadoc
-        '-Dtycho.baseline.replace=none'
-        --fail-at-end
-        -DskipNativeTests=false
-        -DfailIfNoTests=false
-        clean install
-    - name: Performance tests
-      if: contains(github.event.pull_request.labels.*.name, 'performance')
-      working-directory: tests/org.eclipse.swt.tests
-      run: >-
-        ${{ contains(matrix.config.native, 'linux') && 'xvfb-run' || '' }}
-        mvn --batch-mode -V -U -e
-        -DforkCount=1
-        --fail-at-end
-        -DskipNativeTests=true
-        -DfailIfNoTests=true
-        -Dtest=PerformanceTests
-        integration-test
-    - name: Upload Test Results for ${{ matrix.config.name }} / Java-${{ matrix.java }}
-      if: always()
-      uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
-      with:
-        name: test-results-${{ matrix.config.native }}-java${{ matrix.java }}
-        if-no-files-found: warn
-        path: |
-          ${{ github.workspace }}/**/target/surefire-reports/*.xml
-          ${{ github.workspace }}/**/hs_err_pid*.log
+        java: ['21']
+    uses: ./.github/workflows/build.yml
+    with:
+      runner: ubuntu-latest
+      java: ${{ matrix.java }}
+      native: gtk.linux.x86_64
+      performance: ${{ contains(github.event.pull_request.labels.*.name, 'performance') }}
+      runtodotests: ${{ contains(github.event.pull_request.labels.*.name, 'runtodotests') }}
+
+  build-windows:
+    name: Build (Windows)
+    strategy:
+      fail-fast: false
+      matrix:
+        java: ['21']
+    uses: ./.github/workflows/build.yml
+    with:
+      runner: windows-latest
+      java: ${{ matrix.java }}
+      native: win32.win32.x86_64
+      performance: ${{ contains(github.event.pull_request.labels.*.name, 'performance') }}
+      runtodotests: ${{ contains(github.event.pull_request.labels.*.name, 'runtodotests') }}
+
+  build-macos:
+    name: Build (macOS)
+    strategy:
+      fail-fast: false
+      matrix:
+        java: ['21']
+        native: [cocoa.macosx.x86_64, cocoa.macosx.aarch64]
+        runner: [macos-15-intel, macos-latest]
+        exclude:
+          - runner: macos-latest
+            native: cocoa.macosx.x86_64
+          - runner: macos-15-intel
+            native: cocoa.macosx.aarch64
+    uses: ./.github/workflows/build.yml
+    with:
+      runner: ${{ matrix.runner }}
+      java: ${{ matrix.java }}
+      native: ${{ matrix.native }}
+      performance: ${{ contains(github.event.pull_request.labels.*.name, 'performance') }}
+      runtodotests: ${{ contains(github.event.pull_request.labels.*.name, 'runtodotests') }}

binaries/org.eclipse.swt.cocoa.macosx.aarch64/libswt-awt-cocoa-4971r14.jnilib

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dede55b81dfa57246b161f70a6f617f8f3a3f3554c28f53d34109d0c1d8f4ef4
+size 51952

binaries/org.eclipse.swt.cocoa.macosx.aarch64/libswt-awt-cocoa-4971r15.jnilib

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ae8d939f8d70fc673cfb2916a5af6c2fdd7b820db7632f053f33bd16dbb83146
+size 576624

binaries/org.eclipse.swt.cocoa.macosx.aarch64/libswt-cocoa-4971r14.jnilib

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54670ed3d9dd6f51c7c4f82f2238d64468a7440c9a46fa088f9ced24ba4df28d
+size 298864

binaries/org.eclipse.swt.cocoa.macosx.aarch64/libswt-cocoa-4971r15.jnilib

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:41eaa907dd37c0e009f309d8e7d5d0f3f7c12e15736b3c87ed436da3c9b753d0
+size 52352