Skip to content

Commit 45f91bc

Browse files
authored
Merge branch 'eclipse-platform:master' into program_imagedata
2 parents 847fece + 0396508 commit 45f91bc

File tree

6 files changed

+47
-19
lines changed

6 files changed

+47
-19
lines changed

.github/aggregator.pom

Lines changed: 0 additions & 12 deletions
This file was deleted.

.github/toolchains.xml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="UTF8"?>
2+
<toolchains xmlns="http://maven.apache.org/TOOLCHAINS/1.1.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/TOOLCHAINS/1.1.0 http://maven.apache.org/xsd/toolchains-1.1.0.xsd">
5+
<toolchain>
6+
<type>jdk</type>
7+
<provides>
8+
<id>JavaSE-17</id>
9+
<version>17</version>
10+
</provides>
11+
<configuration>
12+
<jdkHome>${env.JAVA_HOME_17_X64}</jdkHome>
13+
</configuration>
14+
</toolchain>
15+
<toolchain>
16+
<type>jdk</type>
17+
<provides>
18+
<id>JavaSE-11</id>
19+
<version>11</version>
20+
</provides>
21+
<configuration>
22+
<jdkHome>${env.JAVA_HOME_11_X64}</jdkHome>
23+
</configuration>
24+
</toolchain>
25+
<toolchain>
26+
<type>jdk</type>
27+
<provides>
28+
<id>JavaSE-1.8</id>
29+
<version>1.8</version>
30+
</provides>
31+
<configuration>
32+
<jdkHome>${env.JAVA_HOME_8_X64}</jdkHome>
33+
</configuration>
34+
</toolchain>
35+
</toolchains>
36+

.github/workflows/junit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,5 @@ jobs:
6464
uses: andymckay/append-gist-action@1fbfbbce708a39bd45846f0955ed5521f2099c6d
6565
with:
6666
token: ${{ secrets.GIST_TOKEN }}
67-
gistURL: https://gist.githubusercontent.com/eclipse-platform/eclipse.platform.swt/
68-
file: test_results_badge.svg
67+
gistURL: https://gist.githubusercontent.com/eclipse-releng-bot/78d110a601baa4ef777ccb472f584038
68+
file: badge.svg

.github/workflows/maven.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
java: [ '11', '17' ]
21+
java: [ '17' ]
2222
config:
2323
- { name: Linux, os: ubuntu-latest, native: gtk.linux.x86_64, cp: .classpath_gtk }
2424
- { name: Windows, os: windows-latest, native: win32.win32.x86_64, cp: .classpath_win32 }
@@ -34,22 +34,25 @@ jobs:
3434
uses: actions/checkout@v3
3535
with:
3636
path: eclipse.platform.swt.binaries
37-
fetch-depth: 0 # required for jgit timestamp provider to work
3837
repository: 'eclipse-platform/eclipse.platform.swt.binaries'
3938
- name: Install Linux requirements
4039
run: sudo apt-get update -qq && sudo apt-get install -qq -y webkit2gtk-driver
4140
if: ${{ matrix.config.native == 'gtk.linux.x86_64'}}
4241
- name: Set up Java ${{ matrix.java }}
4342
uses: actions/setup-java@v3
4443
with:
45-
java-version: ${{ matrix.java }}
44+
java-version: |
45+
8
46+
11
47+
${{ matrix.java }}
4648
distribution: 'temurin'
4749
cache: maven
4850
- name: Build swt.binaries fragments with Maven
4951
uses: GabrielBB/xvfb-action@v1
5052
with:
5153
run: >-
5254
mvn --batch-mode -Pbuild-individual-bundles -DforceContextQualifier=zzz
55+
--global-toolchains ${{ github.workspace }}/eclipse.platform.swt/.github/toolchains.xml
5356
-DskipJni -Dcompare-version-with-baselines.skip=true -Dmaven.compiler.failOnWarning=true install
5457
working-directory: eclipse.platform.swt.binaries
5558
- name: Build with Maven
@@ -66,6 +69,7 @@ jobs:
6669
-Dmaven.test.failure.ignore=true
6770
-DskipNativeTests=false
6871
-DfailIfNoTests=false
72+
--global-toolchains ${{ github.workspace }}/eclipse.platform.swt/.github/toolchains.xml
6973
clean install
7074
working-directory: eclipse.platform.swt
7175
- name: Upload Test Results for ${{ matrix.config.name }} / Java-${{ matrix.java }}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![SWT Matrix Build](https://github.com/eclipse-platform/eclipse.platform.swt/actions/workflows/maven.yml/badge.svg)](https://github.com/eclipse-platform/eclipse.platform.swt/actions/workflows/maven.yml)
1+
[![SWT Matrix Build](https://github.com/eclipse-platform/eclipse.platform.swt/actions/workflows/maven.yml/badge.svg)](https://github.com/eclipse-platform/eclipse.platform.swt/actions/workflows/maven.yml) ![SWT Matrix Tests](https://gist.githubusercontent.com/eclipse-releng-bot/78d110a601baa4ef777ccb472f584038/raw/71510599eb84e852f3e135aa7a3ddf33854ca716/badge.svg)
22

33
Contributing to SWT
44
===================

bundles/org.eclipse.swt/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
forceContextQualifier gets updated during build input process using
3030
ant script <SWT source repo>/bundles/org.eclipse.swt/buildInternal.xml
3131
-->
32-
<forceContextQualifier>v20220919-1402</forceContextQualifier>
32+
<forceContextQualifier>v20220924-2203</forceContextQualifier>
3333
<sonar.sources>Eclipse SWT Accessibility/cocoa,Eclipse SWT Accessibility/common,Eclipse SWT Accessibility/gtk,Eclipse SWT Accessibility/win32,Eclipse SWT AWT/cocoa,Eclipse SWT AWT/common,Eclipse SWT AWT/gtk,Eclipse SWT AWT/win32,Eclipse SWT Browser/cocoa,Eclipse SWT Browser/common,Eclipse SWT Browser/gtk,Eclipse SWT Browser/win32,Eclipse SWT Custom Widgets/common,Eclipse SWT Drag and Drop/cocoa,Eclipse SWT Drag and Drop/common,Eclipse SWT Drag and Drop/gtk,Eclipse SWT Drag and Drop/win32,Eclipse SWT OLE Win32/win32,Eclipse SWT OpenGL/cocoa,Eclipse SWT OpenGL/common,Eclipse SWT OpenGL/glx,Eclipse SWT OpenGL/gtk,Eclipse SWT OpenGL/win32,Eclipse SWT PI/cairo,Eclipse SWT PI/cocoa,Eclipse SWT PI/common,Eclipse SWT PI/gtk,Eclipse SWT PI/win32,Eclipse SWT Printing/cocoa,Eclipse SWT Printing/common,Eclipse SWT Printing/gtk,Eclipse SWT Printing/win32,Eclipse SWT Program/cocoa,Eclipse SWT Program/common,Eclipse SWT Program/gtk,Eclipse SWT Program/win32,Eclipse SWT WebKit/cocoa,Eclipse SWT WebKit/gtk,Eclipse SWT/cairo,Eclipse SWT/cocoa,Eclipse SWT/common,Eclipse SWT/emulated/bidi,Eclipse SWT/emulated/coolbar,Eclipse SWT/emulated/expand,Eclipse SWT/emulated/taskbar,Eclipse SWT/emulated/tooltip,Eclipse SWT/gtk,Eclipse SWT/win32</sonar.sources>
3434
</properties>
3535

0 commit comments

Comments
 (0)