Skip to content

Commit

Permalink
[Build] Unify and clean-up M2E builds
Browse files Browse the repository at this point in the history
  • Loading branch information
HannesWell committed Oct 12, 2022
1 parent 9705f5d commit bb9ce69
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
- name: Generated Meta data
run: mvn generate-sources -f m2e-maven-runtime -Pgenerate-osgi-metadata -Dtycho.mode=maven
run: mvn generate-sources -f m2e-maven-runtime -B -V -Pgenerate-osgi-metadata -Dtycho.mode=maven
- name: Build m2e-core
uses: GabrielBB/xvfb-action@v1
with:
run: mvn clean verify -B -Pits -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true -Dtycho.surefire.timeout=7200
run: mvn clean verify -B -V -Pits -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true
- name: Upload Test Results
uses: actions/upload-artifact@v3
with:
Expand Down
8 changes: 5 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ pipeline {
}
stage('Build') {
steps {
sh 'mvn clean generate-sources -f m2e-maven-runtime/pom.xml -B -Dtycho.mode=maven -Pgenerate-osgi-metadata'
sh 'mvn clean generate-sources -f m2e-maven-runtime/pom.xml -B -V -Dtycho.mode=maven -Pgenerate-osgi-metadata'
wrap([$class: 'Xvnc', useXauthority: true]) {
sh 'mvn clean verify -f pom.xml -B -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true -Peclipse-sign,its -Dtycho.surefire.timeout=7200'
sh 'mvn clean verify -B -V \
-Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true \
-Peclipse-sign,its'
}
}
post {
Expand All @@ -48,7 +50,7 @@ pipeline {
{
echo Deploy m2e repo to ${1}
ssh [email protected] "\
rm -rf ${1}/* && \
rm -rf ${1}/* && \
mkdir -p ${1}"
scp -r org.eclipse.m2e.repository/target/repository/* [email protected]:${1}
}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<tycho-version>3.0.0</tycho-version>

<tycho.testArgLine>-Xmx800m</tycho.testArgLine>
<tycho.surefire.timeout>7200</tycho.surefire.timeout>
<tycho.surefire.timeout>900</tycho.surefire.timeout>
<tycho.surefire.useUIHarness>true</tycho.surefire.useUIHarness>
<tycho.surefire.useUIThread>true</tycho.surefire.useUIThread>
<jacoco.destFile>../target/jacoco.exec</jacoco.destFile>
Expand Down
2 changes: 1 addition & 1 deletion setup/m2e.setup
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
xsi:type="jdt:JRETask"
version="JavaSE-17"
location="${jre.location-17}"
name="JRE for JavaSE-11">
name="JRE for JavaSE-17">
<description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
</setupTask>
<setupTask
Expand Down

0 comments on commit bb9ce69

Please sign in to comment.