Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Build] Move not always desired build parameters out of maven.config #1412

Merged
merged 2 commits into from
Sep 24, 2024
Merged

[Build] Move not always desired build parameters out of maven.config #1412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a68963
[Build] Remove explicit version of tycho-apitools-plugin to inherit it
HannesWell Sep 24, 2024
26a2b44
[Build] Move not always desired build parameters out of maven.config
HannesWell Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ jobs:
projectId: eclipse.pde
build:
uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/mavenBuild.yml@master

with:
maven-goals: clean verify -Ptck
3 changes: 0 additions & 3 deletions .mvn/maven.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
-Pbuild-individual-bundles
-Ptck
-Dcompare-version-with-baselines.skip=false
-DtrimStackTrace=false
--fail-at-end
-Dtycho.localArtifacts=ignore
12 changes: 6 additions & 6 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ pipeline {
stages {
stage('Build') {
steps {
wrap([$class: 'Xvnc', useXauthority: true]) {
xvnc(useXauthority: true) {
sh """
mvn clean verify --batch-mode -Dmaven.repo.local=$WORKSPACE/.m2/repository \
-Pbree-libs \
-Papi-check \
-Pjavadoc \
mvn clean verify -Dmaven.repo.local=$WORKSPACE/.m2/repository \
--fail-at-end --update-snapshots --batch-mode --no-transfer-progress --show-version --errors \
-Pbree-libs -Papi-check -Pjavadoc -Ptck \
${env.BRANCH_NAME=='master' ? '-Peclipse-sign': ''} \
-Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Neither maven-surefire nor Tycho use the property maven.test.error.ignore, they only use maven.test.failure.ignore:

It's often set within SDK projects, but I have the impression that this property actually does not have an effect.
@laeubi or do you now something else that considers it?

-Dcompare-version-with-baselines.skip=false \
-Dmaven.test.failure.ignore=true \
-Dtycho.debug.artifactcomparator \
-Dpde.docs.baselinemode=fail
"""
Expand Down
2 changes: 0 additions & 2 deletions org.eclipse.pde.doc.user/forceQualifierUpdate.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ Modernize pde.project description interfaces: https://github.com/eclipse-pde/ecl
Rework PluginRegistry API and introduce VersionMatchRule enum : https://github.com/eclipse-pde/eclipse.pde/pull/1163
Comparator errors in I20240904-0240
Add missing reference/api content
Pick-up javadoc changes
Force javadoc regeneration
1 change: 0 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-apitools-plugin</artifactId>
<version>${tycho.version}</version>
<configuration>
<failOnWarning>true</failOnWarning>
</configuration>
Expand Down
Loading