This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
commit d956d6c5bcc842c8eaf08b04ffec01c3d3e32113
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Sep 2 18:58:37 2022 +0100
Update coverage configuration based on Commons DBCP
Align CI and coverage configuration
---
.github/workflows/ci.yml | 11 ++++-----
.github/workflows/{ci.yml => coverage.yml} | 37 +++++++++++-------------------
README.md | 1 -
3 files changed, 18 insertions(+), 31 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 765cac8..9ff549d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,6 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+
name: CI
on:
@@ -38,21 +39,19 @@ jobs:
name: JDK${{ matrix.java }} ${{ matrix.os }}
runs-on: ${{ matrix.os }}
steps:
+ - uses: actions/checkout@v3
- uses: actions/cache@v3.0.8
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- - name: Git Checkout
- uses: actions/checkout@v2
- - name: Set up Java
- uses: actions/setup-java@v1
+ - name: Set up JDK ${{ matrix.java }}
+ uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java }}
- name: Build
- run: |
- mvn test --no-transfer-progress
+ run: mvn -V test --file pom.xml --no-transfer-progress
continue-on-error:
true
- name: Upload logs
diff --git a/.github/workflows/ci.yml b/.github/workflows/coverage.yml
similarity index 62%
copy from .github/workflows/ci.yml
copy to .github/workflows/coverage.yml
index 765cac8..b78d383 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/coverage.yml
@@ -5,14 +5,15 @@
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-name: CI
+
+name: Coverage
on:
push:
@@ -26,38 +27,26 @@ env:
LC_ALL: en_US.UTF-8
jobs:
- JDKxx_Matrix:
+ build:
strategy:
- fail-fast: false
matrix:
- java: [ 11, 17, 18, 19-ea ]
- os: [ ubuntu-latest ]
- include:
- - os: windows-latest
- java: 11
- name: JDK${{ matrix.java }} ${{ matrix.os }}
- runs-on: ${{ matrix.os }}
+ java: [ 8 ]
+ runs-on: ubuntu-latest
steps:
+ - uses: actions/checkout@v3
- uses: actions/cache@v3.0.8
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- - name: Git Checkout
- uses: actions/checkout@v2
- - name: Set up Java
- uses: actions/setup-java@v1
+ - name: Set up JDK ${{ matrix.java }}
+ uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java }}
- name: Build
- run: |
- mvn test --no-transfer-progress
- continue-on-error:
- true
- - name: Upload logs
- uses: actions/upload-artifact@v2
+ run: mvn -V test jacoco:report --file pom.xml --no-transfer-progress
+ - name: Upload coverage to Codecov
+ uses: codecov/codecov-action@v3
with:
- name: JDK${{ matrix.java }}-${{ matrix.os }}-logs
- path: output/build/logs/TEST*.txt
- retention-days: 7
+ files: ./target/site/jacoco/jacoco.xml
diff --git a/README.md b/README.md
index 419df3b..aa83ab1 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
# Apache Tomcat migration tool for Jakarta EE
-[](http://travis-ci.org/apache/tomcat-jakartaee-migration)
[](https://coveralls.io/github/apache/tomcat-jakartaee-migration?branch=main)
[](http://www.apache.org/licenses/LICENSE-2.0)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
