From d40d9e56a022ded433f7545a536ab6384308a1d9 Mon Sep 17 00:00:00 2001 From: Jerome Van Der Linden Date: Fri, 17 Mar 2023 16:22:18 +0100 Subject: [PATCH 01/10] send coverage (jacoco) to codecov --- .github/workflows/build.yml | 11 +++++++++-- pom.xml | 33 ++++++++++++++++----------------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3210dad84..c19ba5407 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: name: Java ${{ matrix.java }} env: OS: ${{ matrix.os }} - JAVA: ${{ matrix.java-version }} + JAVA: ${{ matrix.java }} AWS_REGION: eu-west-1 steps: - uses: actions/checkout@v3 @@ -61,6 +61,13 @@ jobs: java-version: ${{ matrix.java }} - name: Build with Maven run: mvn -Pbuild-without-spotbugs -B package --file pom.xml + - name: Upload coverage to Codecov + uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # 3.1.1 + if: ${{ matrix.java == 11.0.x }} # publish results once + with: + files: ./target/jacoco.exec + env_vars: JAVA + name: aws-lambda-powertools-java-codecov savepr: runs-on: ubuntu-latest name: Save PR number if running on PR by dependabot @@ -72,7 +79,7 @@ jobs: echo ${{ github.event.number }} echo ${{ github.event.number }} > ./pr/NR - uses: actions/upload-artifact@v2 - name: Updload artifact + name: Upload artifact with: name: pr path: pr/ diff --git a/pom.xml b/pom.xml index 91014ac87..e25daebd4 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,6 @@ 1.14.0 2.22.2 0.8.8 - 2.7 1.6.8 3.5.0 3.2.1 @@ -321,11 +320,6 @@ jacoco-maven-plugin ${jacoco-maven-plugin.version} - - org.codehaus.mojo - cobertura-maven-plugin - ${cobertura-maven-plugin.version} - org.sonatype.plugins nexus-staging-maven-plugin @@ -407,19 +401,24 @@ report + + merge + + merge + + + + + ${project.basedir} + + **/*.exec + + + + + - - org.codehaus.mojo - cobertura-maven-plugin - - - html - xml - - - - org.sonatype.plugins nexus-staging-maven-plugin From 664bba63465b6c5a5309931810d7faf77160ed56 Mon Sep 17 00:00:00 2001 From: Jerome Van Der Linden Date: Fri, 17 Mar 2023 16:29:21 +0100 Subject: [PATCH 02/10] fix build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c19ba5407..fc0fac07f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,7 +63,7 @@ jobs: run: mvn -Pbuild-without-spotbugs -B package --file pom.xml - name: Upload coverage to Codecov uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # 3.1.1 - if: ${{ matrix.java == 11.0.x }} # publish results once + if: ${{ matrix.java == '11.0.x' }} # publish results once with: files: ./target/jacoco.exec env_vars: JAVA From b02981e139ce54ef777cf66de9045444eca3e37c Mon Sep 17 00:00:00 2001 From: Jerome Van Der Linden Date: Fri, 17 Mar 2023 16:39:26 +0100 Subject: [PATCH 03/10] fix build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fc0fac07f..bf857ee4d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,7 +65,7 @@ jobs: uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # 3.1.1 if: ${{ matrix.java == '11.0.x' }} # publish results once with: - files: ./target/jacoco.exec + files: ${GITHUB_WORKSPACE}/target/jacoco.exec env_vars: JAVA name: aws-lambda-powertools-java-codecov savepr: From b70ac5d36f79c713ba20be2a03331b83a9b92e47 Mon Sep 17 00:00:00 2001 From: Jerome Van Der Linden Date: Fri, 17 Mar 2023 16:58:06 +0100 Subject: [PATCH 04/10] fix build.yml --- .github/workflows/build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bf857ee4d..f116bbbed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,10 +64,6 @@ jobs: - name: Upload coverage to Codecov uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # 3.1.1 if: ${{ matrix.java == '11.0.x' }} # publish results once - with: - files: ${GITHUB_WORKSPACE}/target/jacoco.exec - env_vars: JAVA - name: aws-lambda-powertools-java-codecov savepr: runs-on: ubuntu-latest name: Save PR number if running on PR by dependabot From 2bde48459d3cd3b05cfdb6a2a434aeb410868504 Mon Sep 17 00:00:00 2001 From: Jerome Van Der Linden Date: Fri, 17 Mar 2023 17:48:45 +0100 Subject: [PATCH 05/10] skip examples in coverage --- examples/pom.xml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/examples/pom.xml b/examples/pom.xml index c61e858c5..d76d3780e 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -32,4 +32,32 @@ true + + + + org.jacoco + jacoco-maven-plugin + + + + prepare-agent + + + true + + + + report + + report + + + true + + + + + + + \ No newline at end of file From 39140f7f9742213f8412aeccd0ba80cdfb7ab334 Mon Sep 17 00:00:00 2001 From: Jerome Van Der Linden Date: Fri, 17 Mar 2023 18:07:47 +0100 Subject: [PATCH 06/10] only get the parent merge coverage --- .github/workflows/build.yml | 2 ++ examples/powertools-examples-validation/pom.xml | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f116bbbed..8c1a1d6e2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,6 +64,8 @@ jobs: - name: Upload coverage to Codecov uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # 3.1.1 if: ${{ matrix.java == '11.0.x' }} # publish results once + with: + directory: ./target savepr: runs-on: ubuntu-latest name: Save PR number if running on PR by dependabot diff --git a/examples/powertools-examples-validation/pom.xml b/examples/powertools-examples-validation/pom.xml index f7522303b..cc25c8011 100644 --- a/examples/powertools-examples-validation/pom.xml +++ b/examples/powertools-examples-validation/pom.xml @@ -6,12 +6,11 @@ AWS Lambda Powertools for Java library Examples - Validation - powertools-parent + powertools-examples software.amazon.lambda 1.14.0 - software.amazon.lambda From c15c102c947fa1a390a8150890c163cbbde8bfb4 Mon Sep 17 00:00:00 2001 From: Jerome Van Der Linden Date: Fri, 17 Mar 2023 18:19:18 +0100 Subject: [PATCH 07/10] specify the files manually merge does not work (exec files are not recognize by codeconv) --- .github/workflows/build.yml | 2 +- pom.xml | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c1a1d6e2..eb55b2300 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,7 +65,7 @@ jobs: uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # 3.1.1 if: ${{ matrix.java == '11.0.x' }} # publish results once with: - directory: ./target + files: ./powertools-cloudformation/target/site/jacoco/jacoco.xml,./powertools-core/target/site/jacoco/jacoco.xml,./powertools-idempotency/target/site/jacoco/jacoco.xml,./powertools-logging/target/site/jacoco/jacoco.xml,./powertools-metrics/target/site/jacoco/jacoco.xml,./powertools-parameters/target/site/jacoco/jacoco.xml,./powertools-serialization/target/site/jacoco/jacoco.xml,./powertools-sqs/target/site/jacoco/jacoco.xml,./powertools-tracing/target/site/jacoco/jacoco.xml,./powertools-validation/target/site/jacoco/jacoco.xml savepr: runs-on: ubuntu-latest name: Save PR number if running on PR by dependabot diff --git a/pom.xml b/pom.xml index e25daebd4..04e130634 100644 --- a/pom.xml +++ b/pom.xml @@ -401,22 +401,6 @@ report - - merge - - merge - - - - - ${project.basedir} - - **/*.exec - - - - - From 0fbe1252eaa01993f805cb405f8bc35361c1de53 Mon Sep 17 00:00:00 2001 From: Jerome Van Der Linden Date: Fri, 17 Mar 2023 18:24:22 +0100 Subject: [PATCH 08/10] add maven dependencies cache to avoid re-downloading them each time --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eb55b2300..78b10cd5b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,6 +59,7 @@ jobs: with: distribution: 'zulu' java-version: ${{ matrix.java }} + cache: 'maven' - name: Build with Maven run: mvn -Pbuild-without-spotbugs -B package --file pom.xml - name: Upload coverage to Codecov From 81e708a7ea42a349b8866b68fb2ed9a9accee8b5 Mon Sep 17 00:00:00 2001 From: Jerome Van Der Linden Date: Sat, 18 Mar 2023 17:10:03 +0100 Subject: [PATCH 09/10] add codecov badge to README --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index addb0f631..b22d0a948 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # AWS Lambda Powertools for Java -![aws provider](https://img.shields.io/badge/provider-AWS-orange?logo=amazon-aws&color=ff9900) ![Build status](https://github.com/awslabs/aws-lambda-powertools-java/actions/workflows/build.yml/badge.svg) ![Maven Central](https://img.shields.io/maven-central/v/software.amazon.lambda/powertools-parent) +![aws provider](https://img.shields.io/badge/provider-AWS-orange?logo=amazon-aws&color=ff9900) ![Build status](https://github.com/awslabs/aws-lambda-powertools-java/actions/workflows/build.yml/badge.svg) ![Maven Central](https://img.shields.io/maven-central/v/software.amazon.lambda/powertools-parent) [![codecov.io](https://codecov.io/github/awslabs/aws-lambda-powertools-java/branch/master/graphs/badge.svg)](https://app.codecov.io/gh/awslabs/aws-lambda-powertools-java) + Powertools is a developer toolkit to implement Serverless best practices and increase developer velocity. From 582631de189bd013e643464b337f6c224937bb2a Mon Sep 17 00:00:00 2001 From: Jerome Van Der Linden Date: Mon, 20 Mar 2023 08:24:34 +0100 Subject: [PATCH 10/10] remove os from the matrix --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 78b10cd5b..db25e4164 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,7 +49,6 @@ jobs: java: [8, 8.0.192, 11.0.x, 11.0.3, 12, 13, 15, 16, 17 ] name: Java ${{ matrix.java }} env: - OS: ${{ matrix.os }} JAVA: ${{ matrix.java }} AWS_REGION: eu-west-1 steps: