From 3255c85e6a532c6560252ed2a60fef433f4c1efe Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Sun, 28 Jan 2024 23:33:58 +0100 Subject: [PATCH] [Build] Enable API checks in CI builds Fixes https://github.com/eclipse-platform/eclipse.platform.swt/issues/1003 --- .github/workflows/maven.yml | 3 ++- Jenkinsfile | 4 +++- .../.settings/.api_filters | 11 +++++++++++ .../build.properties | 1 + .../.settings/.api_filters | 11 +++++++++++ .../build.properties | 1 + .../build.properties | 1 + .../build.properties | 1 + .../build.properties | 1 + .../org.eclipse.swt.gtk.linux.x86_64/build.properties | 2 +- .../build.properties | 1 + pom.xml | 1 - 12 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 binaries/org.eclipse.swt.cocoa.macosx.aarch64/.settings/.api_filters create mode 100644 binaries/org.eclipse.swt.cocoa.macosx.x86_64/.settings/.api_filters diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 8141fd92e6..2340781a74 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -62,10 +62,11 @@ jobs: uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1.0.1 with: run: >- - mvn --batch-mode -V -U + mvn --batch-mode -V -e -U --threads 1C -DforkCount=1 -Dnative=${{ matrix.config.native }} + -Papi-check -Dcompare-version-with-baselines.skip=true -Dtycho.baseline.replace=none --fail-at-end diff --git a/Jenkinsfile b/Jenkinsfile index df84e63102..684dda8a86 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -299,7 +299,9 @@ pipeline { dir('eclipse.platform.swt') { sh ''' mvn clean verify \ - --batch-mode --threads 1C -DforkCount=0 \ + --batch-mode --threads 1C -V -e -U -DforkCount=0 \ + -Papi-check \ + -Dtycho.apitools.debug \ -Dcompare-version-with-baselines.skip=false \ -Dorg.eclipse.swt.tests.junit.disable.test_isLocal=true \ -Dmaven.test.failure.ignore=true -Dmaven.test.error.ignore=true diff --git a/binaries/org.eclipse.swt.cocoa.macosx.aarch64/.settings/.api_filters b/binaries/org.eclipse.swt.cocoa.macosx.aarch64/.settings/.api_filters new file mode 100644 index 0000000000..f39c344ebb --- /dev/null +++ b/binaries/org.eclipse.swt.cocoa.macosx.aarch64/.settings/.api_filters @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/binaries/org.eclipse.swt.cocoa.macosx.aarch64/build.properties b/binaries/org.eclipse.swt.cocoa.macosx.aarch64/build.properties index 313103324a..2e8092b5e4 100644 --- a/binaries/org.eclipse.swt.cocoa.macosx.aarch64/build.properties +++ b/binaries/org.eclipse.swt.cocoa.macosx.aarch64/build.properties @@ -38,6 +38,7 @@ source.. = \ ../../bundles/org.eclipse.swt/Eclipse SWT WebKit/cocoa,\ ../../bundles/org.eclipse.swt/Eclipse SWT OpenGL/cocoa,\ ../../bundles/org.eclipse.swt/Eclipse SWT OpenGL/common +output.. = bin/ src.includes = about.html,about_files/ pom.model.property.os=macosx diff --git a/binaries/org.eclipse.swt.cocoa.macosx.x86_64/.settings/.api_filters b/binaries/org.eclipse.swt.cocoa.macosx.x86_64/.settings/.api_filters new file mode 100644 index 0000000000..d58083b5bf --- /dev/null +++ b/binaries/org.eclipse.swt.cocoa.macosx.x86_64/.settings/.api_filters @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/binaries/org.eclipse.swt.cocoa.macosx.x86_64/build.properties b/binaries/org.eclipse.swt.cocoa.macosx.x86_64/build.properties index aeec876cd4..1dc99e2309 100644 --- a/binaries/org.eclipse.swt.cocoa.macosx.x86_64/build.properties +++ b/binaries/org.eclipse.swt.cocoa.macosx.x86_64/build.properties @@ -38,6 +38,7 @@ source.. = \ ../../bundles/org.eclipse.swt/Eclipse SWT WebKit/cocoa,\ ../../bundles/org.eclipse.swt/Eclipse SWT OpenGL/cocoa,\ ../../bundles/org.eclipse.swt/Eclipse SWT OpenGL/common +output.. = bin/ src.includes = about.html,about_files/ pom.model.property.os=macosx diff --git a/binaries/org.eclipse.swt.gtk.linux.aarch64/build.properties b/binaries/org.eclipse.swt.gtk.linux.aarch64/build.properties index 0228600a1c..fb2f3f5dab 100644 --- a/binaries/org.eclipse.swt.gtk.linux.aarch64/build.properties +++ b/binaries/org.eclipse.swt.gtk.linux.aarch64/build.properties @@ -39,6 +39,7 @@ source.. = \ ../../bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx,\ ../../bundles/org.eclipse.swt/Eclipse SWT OpenGL/common,\ ../../bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk +output.. = bin/ src.includes = about.html,about_files/ pom.model.property.os=linux diff --git a/binaries/org.eclipse.swt.gtk.linux.loongarch64/build.properties b/binaries/org.eclipse.swt.gtk.linux.loongarch64/build.properties index 5a1f7410b7..4710c7ba9b 100644 --- a/binaries/org.eclipse.swt.gtk.linux.loongarch64/build.properties +++ b/binaries/org.eclipse.swt.gtk.linux.loongarch64/build.properties @@ -39,6 +39,7 @@ source.. = \ ../../bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx,\ ../../bundles/org.eclipse.swt/Eclipse SWT OpenGL/common,\ ../../bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk +output.. = bin/ src.includes = about.html,about_files/ pom.model.property.os=linux diff --git a/binaries/org.eclipse.swt.gtk.linux.ppc64le/build.properties b/binaries/org.eclipse.swt.gtk.linux.ppc64le/build.properties index 3479dd0683..c9fc6202f2 100644 --- a/binaries/org.eclipse.swt.gtk.linux.ppc64le/build.properties +++ b/binaries/org.eclipse.swt.gtk.linux.ppc64le/build.properties @@ -39,6 +39,7 @@ source.. = \ ../../bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx,\ ../../bundles/org.eclipse.swt/Eclipse SWT OpenGL/common,\ ../../bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk +output.. = bin/ src.includes = about.html,about_files/ pom.model.property.os=linux diff --git a/binaries/org.eclipse.swt.gtk.linux.x86_64/build.properties b/binaries/org.eclipse.swt.gtk.linux.x86_64/build.properties index 467c74faba..e77b3ffccc 100644 --- a/binaries/org.eclipse.swt.gtk.linux.x86_64/build.properties +++ b/binaries/org.eclipse.swt.gtk.linux.x86_64/build.properties @@ -40,7 +40,7 @@ source.. = \ ../../bundles/org.eclipse.swt/Eclipse SWT OpenGL/glx,\ ../../bundles/org.eclipse.swt/Eclipse SWT OpenGL/common,\ ../../bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk - +output.. = bin/ src.includes = about.html,about_files/ pom.model.property.os=linux diff --git a/binaries/org.eclipse.swt.win32.win32.x86_64/build.properties b/binaries/org.eclipse.swt.win32.win32.x86_64/build.properties index cfdeed5123..2e0b52926c 100644 --- a/binaries/org.eclipse.swt.win32.win32.x86_64/build.properties +++ b/binaries/org.eclipse.swt.win32.win32.x86_64/build.properties @@ -34,6 +34,7 @@ source.. = \ ../../bundles/org.eclipse.swt/Eclipse SWT Browser/win32,\ ../../bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32,\ ../../bundles/org.eclipse.swt/Eclipse SWT OpenGL/common +output.. = bin/ src.includes = about.html,about_files/ pom.model.property.os=win32 diff --git a/pom.xml b/pom.xml index c01a38f07f..a8fd8340a1 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,6 @@ - - - - true