Skip to content

Commit

Permalink
Workflow update (#1403)
Browse files Browse the repository at this point in the history
* Workflow update

- Updated action dependencies
- Added 21 java version support
- Jobs don't fail on error
- Updated build dependencies for tests (Java 21 support)

* Removed .travis.yml

* Updater arlington/jakarta workflow
  • Loading branch information
ProxyNexus authored Feb 23, 2024
1 parent fed1907 commit 144ebac
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 41 deletions.
17 changes: 10 additions & 7 deletions .github/workflows/test-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,19 @@ on:
jobs:
build:
name: Checkout and Build
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

continue-on-error: true

strategy:
fail-fast: false
matrix:
java-version: [8, 11, 16, 17]
java-version: [8, 11, 16, 17, 21]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: JDK setup
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java-version }}
distribution: 'temurin'
Expand All @@ -25,18 +28,18 @@ jobs:
run: mvn --batch-mode --update-snapshots verify
- name: Upload coverage report
if: matrix.java-version == 8
uses: actions/upload-artifact@master
uses: actions/upload-artifact@v4
with:
name: coverage-report
path: core/target/site/jacoco/
coverage:
name: Quality Assurance
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
needs: [ build ]

steps:
- name: Download coverage report
uses: actions/download-artifact@master
uses: actions/download-artifact@v4
with:
name: coverage-report
path: core/target/site/jacoco/
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/update-arlington-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,21 @@ jobs:
checkout-and-build:
runs-on: ubuntu-latest

continue-on-error: true

strategy:
fail-fast: false
matrix:
java-version: [11, 16, 17]
java-version: [11, 16, 17, 21]

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: integration
- name: JDK setup
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java-version }}
distribution: 'temurin'
Expand All @@ -58,7 +61,7 @@ jobs:
needs: checkout-and-build
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: integration
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/update-jakarta-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,21 @@ jobs:
checkout-and-build:
runs-on: ubuntu-latest

continue-on-error: true

strategy:
fail-fast: false
matrix:
java-version: [11, 16, 17]
java-version: [11, 16, 17, 21]

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: integration
- name: JDK setup
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java-version }}
distribution: 'temurin'
Expand All @@ -44,7 +47,7 @@ jobs:
needs: checkout-and-build
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: integration
Expand Down
24 changes: 0 additions & 24 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Quick Start

In order to build the library you'll need:

* Java 8 - 17, which can be downloaded [from Oracle](https://www.oracle.com/technetwork/java/javase/downloads/index.html), or for Linux users [OpenJDK](https://openjdk.java.net/install/index.html).
* Java 8 - 21, which can be downloaded [from Oracle](https://www.oracle.com/technetwork/java/javase/downloads/index.html), or for Linux users [OpenJDK](https://openjdk.java.net/install/index.html).
* [Maven v3+](https://maven.apache.org/)

Life will be easier if you also use [Git](https://git-scm.com/) to obtain and manage the source.
Expand Down
31 changes: 30 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,28 +82,45 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
</plugin>

<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.11</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.16.2</version>
</plugin>

</plugins>
</build>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
Expand All @@ -112,10 +129,22 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
<version>3.7.1</version>
<version>3.15.6</version>
<scope>test</scope>
</dependency>

Expand Down

0 comments on commit 144ebac

Please sign in to comment.