Skip to content

Commit 369b34f

Browse files
committed
Move the tycho-version into the maven.config and unify build arguments
Move specification of the -Dmaven.test.error/failure.ignore=true properties to the build files again, so that local builds can fail.
1 parent e8a3f83 commit 369b34f

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

.github/workflows/maven.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ jobs:
4343
- name: Build m2e-core
4444
uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1.0.1
4545
with:
46-
run: mvn clean verify -Pits -Dtycho.p2.baselineMode=failCommon --batch-mode
46+
run: mvn clean verify --batch-mode -Pits -Dtycho.p2.baselineMode=failCommon -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true
4747
- name: Upload Test Results
4848
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
4949
with:
5050
name: test-results-${{ matrix.os }}
51-
if-no-files-found: error
51+
if-no-files-found: warn
5252
path: |
5353
${{ github.workspace }}/**/target/surefire-reports/*.xml
5454
event_file:

.mvn/extensions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<extension>
44
<groupId>org.eclipse.tycho</groupId>
55
<artifactId>tycho-build</artifactId>
6-
<version>4.0.4</version>
6+
<version>${tycho-version}</version>
77
</extension>
88
</extensions>

.mvn/maven.config

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
--errors
33
--update-snapshots
44
--no-transfer-progress
5-
-Dmaven.test.error.ignore=true
6-
-Dmaven.test.failure.ignore=true
7-
-Dtycho.target.pomDependencies=consider
5+
--fail-at-end
6+
-Dtycho.localArtifacts=ignore
7+
-Dtycho.target.pomDependencies=consider
8+
-Dtycho-version=4.0.4

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ pipeline {
4242
withCredentials([string(credentialsId: 'gpg-passphrase', variable: 'KEYRING_PASSPHRASE')]) {
4343
xvnc(useXauthority: true) {
4444
sh '''
45-
mavenArgs="clean verify -Dtycho.p2.baselineMode=failCommon --batch-mode"
45+
mavenArgs="clean verify --batch-mode -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true -Dtycho.p2.baselineMode=failCommon"
4646
if [[ ${BRANCH_NAME} == master ]] || [[ ${BRANCH_NAME} =~ m2e-[0-9]+\\.[0-9]+\\.x ]]; then
4747
mvn ${mavenArgs} -Peclipse-sign,its -Dgpg.passphrase="${KEYRING_PASSPHRASE}" -Dgpg.keyname="011C526F29B2CE79"
4848
else

m2e-parent/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
<properties>
2525
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
26-
<tycho-version>4.0.4</tycho-version>
2726
<tycho.p2.baselineMode>warn</tycho.p2.baselineMode>
2827
<scmConnectionRaw>scm:git:https://github.com/eclipse-m2e/m2e-core.git</scmConnectionRaw>
2928
</properties>

setup/tychoSnapshotSettings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd">
33
<!-- This Maven-settings file allows to test Tycho snapshots without the need to install them into the local Maven repository
44
and thus makes it possible to test snapshots of Tycho's extension in the CI.
5-
To use it, add the following arguments to the Maven command: -s setup/tychoSnapshotSettings.xml -U -->
5+
To use it, add the following line of arguments to the '.mvn/maven.config' file: -s setup/tychoSnapshotSettings.xml -U -->
66
<profiles>
77
<profile>
88
<id>tycho-snapshots</id>

0 commit comments

Comments
 (0)