From f715f7ce6a3aa48008f857722b211206ae7dd7c9 Mon Sep 17 00:00:00 2001 From: indraniBan <133205641+indraniBan@users.noreply.github.com> Date: Tue, 16 Apr 2024 16:18:49 +0530 Subject: [PATCH 01/14] Create jacoco Jacoco yml file added --- .github/workflows/jacoco | 41 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 .github/workflows/jacoco diff --git a/.github/workflows/jacoco b/.github/workflows/jacoco new file mode 100644 index 0000000..be12d5a --- /dev/null +++ b/.github/workflows/jacoco @@ -0,0 +1,41 @@ +name: Package + +on: + push: + branches: [ "feature/version/upgrade"] + paths-ignore: + - target/** + + pull_request: + branches: [ "feature/version/upgrade" ] + paths-ignore: + - target/** + +env: + ENV_VAR: test + +jobs: + Package-test: + runs-on: ubuntu-latest + steps: + + - name: Checkout code + uses: actions/checkout@v2 + + - name: Setup JDK 17 + uses: actions/setup-java@v2 + with: + java-version: 17 + distribution: 'adopt' + + - name: Build with Maven + run: mvn -B clean package + + - name: Run tests with JaCoCo + run: mvn test jacoco:report + + - name: Upload JaCoCo coverage report + uses: actions/upload-artifact@v2 + with: + name: jacoco-report + path: target/site/jacoco From 02db9e7076051f1b92deccab4b10b4718ab8d41f Mon Sep 17 00:00:00 2001 From: indraniBan <133205641+indraniBan@users.noreply.github.com> Date: Tue, 16 Apr 2024 16:24:24 +0530 Subject: [PATCH 02/14] Update jacoco edit --- .github/workflows/jacoco | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/jacoco b/.github/workflows/jacoco index be12d5a..5cd54c0 100644 --- a/.github/workflows/jacoco +++ b/.github/workflows/jacoco @@ -2,12 +2,12 @@ name: Package on: push: - branches: [ "feature/version/upgrade"] + branches: [ "feature/Junit"] paths-ignore: - target/** pull_request: - branches: [ "feature/version/upgrade" ] + branches: [ "feature/Junit" ] paths-ignore: - target/** From 92ff1f7415c65cf3a6663d1bad900948df3741e1 Mon Sep 17 00:00:00 2001 From: indraniBan <133205641+indraniBan@users.noreply.github.com> Date: Tue, 16 Apr 2024 16:26:23 +0530 Subject: [PATCH 03/14] Update jacoco test --- .github/workflows/jacoco | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/jacoco b/.github/workflows/jacoco index 5cd54c0..3736cbf 100644 --- a/.github/workflows/jacoco +++ b/.github/workflows/jacoco @@ -1,4 +1,4 @@ -name: Package +name: jacoco on: push: From 8e6f2e1ea10c58f53b79d93c014c68dd349ff03a Mon Sep 17 00:00:00 2001 From: indraniBan <133205641+indraniBan@users.noreply.github.com> Date: Tue, 16 Apr 2024 16:31:45 +0530 Subject: [PATCH 04/14] Update jacoco test jacoco --- .github/workflows/jacoco | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/jacoco b/.github/workflows/jacoco index 3736cbf..bdb0c4b 100644 --- a/.github/workflows/jacoco +++ b/.github/workflows/jacoco @@ -2,12 +2,12 @@ name: jacoco on: push: - branches: [ "feature/Junit"] + branches: [ "feature/version/upgrade"] paths-ignore: - target/** pull_request: - branches: [ "feature/Junit" ] + branches: [ "feature/version/upgrade" ] paths-ignore: - target/** @@ -29,10 +29,10 @@ jobs: distribution: 'adopt' - name: Build with Maven - run: mvn -B clean package + run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }} - - name: Run tests with JaCoCo - run: mvn test jacoco:report + - name: Build WAR file + run: mvn -B package --file pom.xml - name: Upload JaCoCo coverage report uses: actions/upload-artifact@v2 From 0f80dd81f2958e7165ece8bee7096f5ed643630a Mon Sep 17 00:00:00 2001 From: indraniBan <133205641+indraniBan@users.noreply.github.com> Date: Tue, 16 Apr 2024 16:32:49 +0530 Subject: [PATCH 05/14] Update jacoco --- .github/workflows/jacoco | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/jacoco b/.github/workflows/jacoco index bdb0c4b..23611c2 100644 --- a/.github/workflows/jacoco +++ b/.github/workflows/jacoco @@ -2,12 +2,12 @@ name: jacoco on: push: - branches: [ "feature/version/upgrade"] + branches: [ "feature/Junit"] paths-ignore: - target/** pull_request: - branches: [ "feature/version/upgrade" ] + branches: [ "feature/Junit" ] paths-ignore: - target/** From c451dd6661db2e3b2a13eee5989d74ea7d2acdec Mon Sep 17 00:00:00 2001 From: indraniBan <133205641+indraniBan@users.noreply.github.com> Date: Tue, 16 Apr 2024 21:44:02 +0530 Subject: [PATCH 06/14] Update jacoco --- .github/workflows/jacoco | 52 +++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/.github/workflows/jacoco b/.github/workflows/jacoco index 23611c2..86f0348 100644 --- a/.github/workflows/jacoco +++ b/.github/workflows/jacoco @@ -1,41 +1,33 @@ -name: jacoco +name: Jacoco Coverage on: - push: - branches: [ "feature/Junit"] - paths-ignore: - - target/** - pull_request: - branches: [ "feature/Junit" ] - paths-ignore: - - target/** - -env: - ENV_VAR: test + branches: [ feature/version/upgrade ] jobs: - Package-test: + build-and-test: runs-on: ubuntu-latest + steps: - - - name: Checkout code + - name: Checkout code uses: actions/checkout@v2 - - - name: Setup JDK 17 + + - name: Set up JDK uses: actions/setup-java@v2 with: - java-version: 17 - distribution: 'adopt' - + java-version: '17' + - name: Build with Maven - run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }} - - - name: Build WAR file - run: mvn -B package --file pom.xml - - - name: Upload JaCoCo coverage report - uses: actions/upload-artifact@v2 - with: - name: jacoco-report - path: target/site/jacoco + run: mvn clean verify + + - name: Upload Jacoco Report + uses: actions/upload-artifact@v2 + with: + name: jacoco-report + path: target/site/jacoco + + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v2.1.0 + with: + token: ${{ secrets.CODECOV_TOKEN }} + files: ./target/site/jacoco/jacoco.xml From b671512709a775002166180a4aaf1ea03892cd80 Mon Sep 17 00:00:00 2001 From: Vidyadevi Salunkhe <84471226+Vidyaaa24@users.noreply.github.com> Date: Wed, 17 Apr 2024 18:50:40 +0530 Subject: [PATCH 07/14] Create jacoco-1.yml create seperate jacoco file --- .github/workflows/jacoco-1.yml | 39 ++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/jacoco-1.yml diff --git a/.github/workflows/jacoco-1.yml b/.github/workflows/jacoco-1.yml new file mode 100644 index 0000000..f7b1ed4 --- /dev/null +++ b/.github/workflows/jacoco-1.yml @@ -0,0 +1,39 @@ +name: jacoco-1 + +on: + push: + branches: [ "feature/Junit"] + paths-ignore: + - 'target/**' + pull_request: + branches: [ "feature/Junit" ] + paths-ignore: + - 'target/**' + +env: + ENV_VAR: test + +jobs: + Package-test: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Setup JDK 17 + uses: actions/setup-java@v2 + with: + java-version: 17 + distribution: 'adopt' + + - name: Build with Maven + run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }} + + - name: Build WAR file + run: mvn -B package --file pom.xml + + - name: Upload JaCoCo coverage report + uses: actions/upload-artifact@v2 + with: + name: jacoco-report + path: target/site/jacoco From ace2e69b06f695f9df96c9c36ef7fe225fa51216 Mon Sep 17 00:00:00 2001 From: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com> Date: Mon, 6 May 2024 13:25:14 +0530 Subject: [PATCH 08/14] Update jacoco --- .github/workflows/jacoco | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/jacoco b/.github/workflows/jacoco index 86f0348..c5697b8 100644 --- a/.github/workflows/jacoco +++ b/.github/workflows/jacoco @@ -30,4 +30,4 @@ jobs: uses: codecov/codecov-action@v2.1.0 with: token: ${{ secrets.CODECOV_TOKEN }} - files: ./target/site/jacoco/jacoco.xml + files: ./target/site/jacoco/index.html From a7435b582c4af29e92b9f406395cd0b32e2c79a2 Mon Sep 17 00:00:00 2001 From: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com> Date: Mon, 6 May 2024 13:30:54 +0530 Subject: [PATCH 09/14] Update jacoco-1.yml --- .github/workflows/jacoco-1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/jacoco-1.yml b/.github/workflows/jacoco-1.yml index f7b1ed4..eee91fd 100644 --- a/.github/workflows/jacoco-1.yml +++ b/.github/workflows/jacoco-1.yml @@ -36,4 +36,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: jacoco-report - path: target/site/jacoco + path: target/site/jacoco/index.html From 43340cd3208a7eac488b0cfb677cda083b57ca96 Mon Sep 17 00:00:00 2001 From: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com> Date: Mon, 6 May 2024 13:48:25 +0530 Subject: [PATCH 10/14] Update jacoco-1.yml --- .github/workflows/jacoco-1.yml | 45 +++++++++++++++------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/.github/workflows/jacoco-1.yml b/.github/workflows/jacoco-1.yml index eee91fd..fd34edd 100644 --- a/.github/workflows/jacoco-1.yml +++ b/.github/workflows/jacoco-1.yml @@ -1,39 +1,34 @@ -name: jacoco-1 +name: Jacoco Coverage on: push: - branches: [ "feature/Junit"] - paths-ignore: - - 'target/**' + branches: + - feature/Junit pull_request: - branches: [ "feature/Junit" ] - paths-ignore: - - 'target/**' - -env: - ENV_VAR: test + branches: + - feature/Junit jobs: - Package-test: + build: runs-on: ubuntu-latest + steps: - - name: Checkout code + - name: Checkout code uses: actions/checkout@v2 - - - name: Setup JDK 17 + + - name: Set up JDK uses: actions/setup-java@v2 with: - java-version: 17 - distribution: 'adopt' - - - name: Build with Maven - run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }} - - - name: Build WAR file - run: mvn -B package --file pom.xml - - - name: Upload JaCoCo coverage report + java-version: '17' + + - name: Build with Gradle + run: ./gradlew build + + - name: Run tests with Jacoco + run: ./gradlew test jacocoTestReport + + - name: Upload Jacoco report uses: actions/upload-artifact@v2 with: name: jacoco-report - path: target/site/jacoco/index.html + path: build/reports/jacoco/test/html From 90aff8a21ecf7ef54a5c04d449188dee8ca525c0 Mon Sep 17 00:00:00 2001 From: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com> Date: Mon, 6 May 2024 13:50:17 +0530 Subject: [PATCH 11/14] Update jacoco-1.yml --- .github/workflows/jacoco-1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/jacoco-1.yml b/.github/workflows/jacoco-1.yml index fd34edd..bf864be 100644 --- a/.github/workflows/jacoco-1.yml +++ b/.github/workflows/jacoco-1.yml @@ -25,7 +25,7 @@ jobs: run: ./gradlew build - name: Run tests with Jacoco - run: ./gradlew test jacocoTestReport + run: mvn clean install - name: Upload Jacoco report uses: actions/upload-artifact@v2 From f468800a925ed24bcf5190218df3d34390b831e5 Mon Sep 17 00:00:00 2001 From: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com> Date: Mon, 6 May 2024 13:52:56 +0530 Subject: [PATCH 12/14] Update jacoco-1.yml --- .github/workflows/jacoco-1.yml | 45 +++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/.github/workflows/jacoco-1.yml b/.github/workflows/jacoco-1.yml index bf864be..eee91fd 100644 --- a/.github/workflows/jacoco-1.yml +++ b/.github/workflows/jacoco-1.yml @@ -1,34 +1,39 @@ -name: Jacoco Coverage +name: jacoco-1 on: push: - branches: - - feature/Junit + branches: [ "feature/Junit"] + paths-ignore: + - 'target/**' pull_request: - branches: - - feature/Junit + branches: [ "feature/Junit" ] + paths-ignore: + - 'target/**' + +env: + ENV_VAR: test jobs: - build: + Package-test: runs-on: ubuntu-latest - steps: - - name: Checkout code + - name: Checkout code uses: actions/checkout@v2 - - - name: Set up JDK + + - name: Setup JDK 17 uses: actions/setup-java@v2 with: - java-version: '17' - - - name: Build with Gradle - run: ./gradlew build - - - name: Run tests with Jacoco - run: mvn clean install - - - name: Upload Jacoco report + java-version: 17 + distribution: 'adopt' + + - name: Build with Maven + run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }} + + - name: Build WAR file + run: mvn -B package --file pom.xml + + - name: Upload JaCoCo coverage report uses: actions/upload-artifact@v2 with: name: jacoco-report - path: build/reports/jacoco/test/html + path: target/site/jacoco/index.html From 0625e09ec410a2701cec462019d3559aba6efdb5 Mon Sep 17 00:00:00 2001 From: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com> Date: Mon, 6 May 2024 17:46:17 +0530 Subject: [PATCH 13/14] Update jacoco-1.yml --- .github/workflows/jacoco-1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/jacoco-1.yml b/.github/workflows/jacoco-1.yml index eee91fd..87a4ea4 100644 --- a/.github/workflows/jacoco-1.yml +++ b/.github/workflows/jacoco-1.yml @@ -27,7 +27,7 @@ jobs: distribution: 'adopt' - name: Build with Maven - run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }} + run: mvn clean install -DENV_VAR=test - name: Build WAR file run: mvn -B package --file pom.xml From 11c4b582495927026c21326fa226d976a173e0f8 Mon Sep 17 00:00:00 2001 From: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com> Date: Mon, 6 May 2024 17:51:07 +0530 Subject: [PATCH 14/14] Update jacoco-1.yml --- .github/workflows/jacoco-1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/jacoco-1.yml b/.github/workflows/jacoco-1.yml index 87a4ea4..0263954 100644 --- a/.github/workflows/jacoco-1.yml +++ b/.github/workflows/jacoco-1.yml @@ -36,4 +36,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: jacoco-report - path: target/site/jacoco/index.html + path: target/site/jacoco/