Skip to content

Commit

Permalink
Update README, GitHub action build workflow and Jenkins build
Browse files Browse the repository at this point in the history
- Update GitHub action build workflow to build both in Java 11 and java 17
- Update Jenkins build to build with Java 17

Remark: Once PR is approved, ensure the deploy and release jobs are updated to Java 17 as well!!
  • Loading branch information
ndoschek committed Jan 10, 2023
1 parent 7dc599c commit 252d883
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- name: Set up JDK 11
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
distribution: 'temurin'
java-version: 17

- name: Build with Maven on Windows
if: matrix.os == 'windows-2019'
Expand All @@ -44,10 +45,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- name: Set up JDK 11
uses: actions/setup-java@v1
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
distribution: 'temurin'
java-version: 17

- name: Build with Maven on Windows
if: matrix.os == 'windows-2019'
Expand Down
8 changes: 4 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pipeline {

tools {
maven 'apache-maven-latest'
jdk 'openjdk-jdk11-latest'
jdk 'openjdk-jdk17-latest'
}

environment {
Expand All @@ -16,15 +16,15 @@ pipeline {
// ignore test failures since we parse the test results afterwards
timeout(30) {
sh './mvnw clean verify -Pm2 -B -Dmaven.test.failure.ignore=true'
}
}
}
}

stage ('Build: Eclipse-based (P2)') {
steps {
// ignore test failures since we parse the test results afterwards
timeout(30) {
sh './mvnw clean verify -Pp2 -B -Dmaven.test.failure.ignore=true'
sh './mvnw clean verify -Pp2 -B -Dmaven.test.failure.ignore=true'
}
}
}
Expand All @@ -37,7 +37,7 @@ pipeline {
build job: 'deploy-emfcloud-modelserver-p2', wait: false
},
m2: {
build job: 'deploy-emfcloud-modelserver-m2', wait: false
build job: 'deploy-emfcloud-modelserver-m2', wait: false
}
)
}
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ For more information, please visit the [EMF.cloud Website](https://www.eclipse.o

The following libraries/frameworks need to be installed on your system:

| | |
| ---------------------------------------------------------------------------- | --------- |
| [Java](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html) | `11` |
| [Maven](https://maven.apache.org/) | `<=3.8.4` |
| | | |
| ---------------------------------------------------------------------------- | --------- | ------------------------------------------------ |
| [Java](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html) | `>= 11` | we support the two last LTS versions (11 and 17) |
| [Maven](https://maven.apache.org/) | `<=3.8.4` | |

_Remark:_ There is currently a build problem with the latest Maven version `3.8.5`, which causes a build error for the `p2` build. (See also issues #201 and will be investigated and fixed with issue #203).

Expand Down

0 comments on commit 252d883

Please sign in to comment.