From 5e465fd82b659d836da74b58503a5a4e45e65645 Mon Sep 17 00:00:00 2001 From: Ber-kan Date: Tue, 21 Jan 2025 15:23:44 +0100 Subject: [PATCH 1/9] onnodig --- test.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 test.txt diff --git a/test.txt b/test.txt deleted file mode 100644 index 4effa19..0000000 --- a/test.txt +++ /dev/null @@ -1 +0,0 @@ -hello! From d68668668baee1225111ad9567126c04e85d9753 Mon Sep 17 00:00:00 2001 From: Ber-kan Date: Tue, 21 Jan 2025 15:54:24 +0100 Subject: [PATCH 2/9] report zonder zip generaten --- .github/workflows/dotnet.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 506ef80..e9c2931 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -91,16 +91,20 @@ jobs: - name: Generate HTML Coverage Report run: | - dotnet tool install --global dotnet-reportgenerator-globaltool - reportgenerator -reports:"./**/TestResults/**/coverage.cobertura.xml" -targetdir:"./coverage-html" -reporttypes:Html - - - - name: Upload HTML Coverage Report + dotnet tool install --global dotnet-reportgenerator-globaltool + reportgenerator -reports:"./**/TestResults/**/coverage.cobertura.xml" -targetdir:"./coverage-html" -reporttypes:Html + + - name: Upload HTML Coverage Report Artifact uses: actions/upload-artifact@v3 with: name: html-coverage-report path: ./coverage-html/ - + + - name: Upload HTML Coverage Report to GitHub Pages + uses: actions/upload-pages-artifact@v1 + with: + path: ./coverage-html/ + publish: runs-on: ubuntu-latest From 8e8c61687b520feb99a833ab1e64cebe4cdcbeb9 Mon Sep 17 00:00:00 2001 From: Ber-kan Date: Tue, 21 Jan 2025 16:19:14 +0100 Subject: [PATCH 3/9] aanpassing --- .github/workflows/dotnet.yml | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index e9c2931..d747c29 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -58,17 +58,14 @@ jobs: - name: Restore Test Project Dependencies run: dotnet restore Test/Test.csproj - - + - name: Build Test Project run: dotnet build --no-restore --configuration Release Test/Test.csproj - - + - name: Run Tests with Code Coverage run: | dotnet test ./Test --collect:"XPlat Code Coverage" --results-directory ./Test/TestResults - - + - name: Extract Coverage Percentage run: | COVERAGE_FILE=$(find . -path "./Test/TestResults/**/coverage.cobertura.xml" | head -n 1) @@ -77,34 +74,27 @@ jobs: exit 1 fi echo "Coverage file found at $COVERAGE_FILE" - + COVERAGE=$(grep -oP '(?<=line-rate=")[^"]*' "$COVERAGE_FILE" | awk '{s+=$1; c++} END {print (c > 0) ? s/c*100 : 0}') echo "Calculated coverage: $COVERAGE%" - + REQUIRED_COVERAGE=20 if (( $(echo "$COVERAGE < $REQUIRED_COVERAGE" | bc -l) )); then echo "Code coverage is below the required threshold of $REQUIRED_COVERAGE%. Failing the workflow." exit 1 fi echo "Code coverage meets the required threshold." - - + - name: Generate HTML Coverage Report run: | - dotnet tool install --global dotnet-reportgenerator-globaltool - reportgenerator -reports:"./**/TestResults/**/coverage.cobertura.xml" -targetdir:"./coverage-html" -reporttypes:Html - + dotnet tool install --global dotnet-reportgenerator-globaltool + reportgenerator -reports:"./**/TestResults/**/coverage.cobertura.xml" -targetdir:"./coverage-html" -reporttypes:Html + - name: Upload HTML Coverage Report Artifact uses: actions/upload-artifact@v3 with: name: html-coverage-report - path: ./coverage-html/ - - - name: Upload HTML Coverage Report to GitHub Pages - uses: actions/upload-pages-artifact@v1 - with: - path: ./coverage-html/ - + path: ./coverage-html/ publish: runs-on: ubuntu-latest From af71db923d74dd643ae8007638b4876de88f4685 Mon Sep 17 00:00:00 2001 From: Ber-kan Date: Tue, 21 Jan 2025 22:40:19 +0100 Subject: [PATCH 4/9] aanpassing --- .github/workflows/dotnet.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index d747c29..17e2e50 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -88,10 +88,20 @@ jobs: - name: Generate HTML Coverage Report run: | dotnet tool install --global dotnet-reportgenerator-globaltool - reportgenerator -reports:"./**/TestResults/**/coverage.cobertura.xml" -targetdir:"./coverage-html" -reporttypes:Html - + reportgenerator + -reports:"./**/TestResults/**/coverage.cobertura.xml" + -targetdir:"./coverage-html" + -reporttypes:Html;MarkdownSummaryGithub + + # - name: reportgenerator + # uses: danielpalme/ReportGenerator-GitHub-Action@v5 + # with: + # reports: cobertura.Html + # targetdir: Test + # reporttypes: Html;MarkdownSummaryGithub + - name: Upload HTML Coverage Report Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: html-coverage-report path: ./coverage-html/ From b8d452e3aabd826accae99b8dcb303c964ef8fce Mon Sep 17 00:00:00 2001 From: Ber-kan Date: Tue, 21 Jan 2025 22:42:40 +0100 Subject: [PATCH 5/9] cicd tet braanch aangemaakt en in de yaml fiel gezet zodat het testen misscien makkelijker kan zonder naar main te pushen --- .github/workflows/dotnet.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 17e2e50..08d6d70 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -8,12 +8,14 @@ on: - 6.2.workflow - cicd_deploy - publish + - cicd_tester pull_request: branches: - main - 6.2.workflow - cicd_deploy - publish + - cicd_tester jobs: From 73b2d28ffa4818d438f088c343764ba081d7daa2 Mon Sep 17 00:00:00 2001 From: Ber-kan Date: Tue, 21 Jan 2025 22:47:13 +0100 Subject: [PATCH 6/9] aanpassingen/fout verbeteren --- .github/workflows/dotnet.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 08d6d70..126dcc8 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -90,10 +90,7 @@ jobs: - name: Generate HTML Coverage Report run: | dotnet tool install --global dotnet-reportgenerator-globaltool - reportgenerator - -reports:"./**/TestResults/**/coverage.cobertura.xml" - -targetdir:"./coverage-html" - -reporttypes:Html;MarkdownSummaryGithub + reportgenerator -reports:"./**/TestResults/**/coverage.cobertura.xml" -targetdir:"./coverage-html" -reporttypes:Html;MarkdownSummaryGithub # - name: reportgenerator # uses: danielpalme/ReportGenerator-GitHub-Action@v5 From d688a031b4554c7c357773a5d1c0391c327a404b Mon Sep 17 00:00:00 2001 From: Ber-kan Date: Tue, 21 Jan 2025 22:54:38 +0100 Subject: [PATCH 7/9] nieuwe generator proberen --- .github/workflows/dotnet.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 126dcc8..e054a29 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -87,18 +87,18 @@ jobs: fi echo "Code coverage meets the required threshold." - - name: Generate HTML Coverage Report - run: | - dotnet tool install --global dotnet-reportgenerator-globaltool - reportgenerator -reports:"./**/TestResults/**/coverage.cobertura.xml" -targetdir:"./coverage-html" -reporttypes:Html;MarkdownSummaryGithub - - # - name: reportgenerator - # uses: danielpalme/ReportGenerator-GitHub-Action@v5 - # with: - # reports: cobertura.Html - # targetdir: Test - # reporttypes: Html;MarkdownSummaryGithub + # - name: Generate HTML Coverage Report + # run: | + # dotnet tool install --global dotnet-reportgenerator-globaltool + # reportgenerator -reports:"./**/TestResults/**/coverage.cobertura.xml" -targetdir:"./coverage-html" -reporttypes:Html;MarkdownSummaryGithub + - name: ReportGenerator + uses: danielpalme/ReportGenerator-GitHub-Action@5 + with: + reports: '*Test*/TestResults/*/coverage.cobertura.xml' + targetdir: "./coverage-html" + reporttypes: "Html;MarkdownSummaryGithub" + - name: Upload HTML Coverage Report Artifact uses: actions/upload-artifact@v4 with: From 1eef18c09e3a7b683d67e8366703eb1423700bed Mon Sep 17 00:00:00 2001 From: Ber-kan Date: Tue, 21 Jan 2025 23:07:37 +0100 Subject: [PATCH 8/9] md file publish proberen --- .github/workflows/dotnet.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index e054a29..5fff483 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -103,7 +103,12 @@ jobs: uses: actions/upload-artifact@v4 with: name: html-coverage-report - path: ./coverage-html/ + path: ./coverage-html/ + + - name: Publish coverage in build summary # Only applicable if 'MarkdownSummaryGithub' or one of the other Markdown report types is generated + #run: cat coveragereport/SummaryGithub.md >> $GITHUB_STEP_SUMMARY # Adjust path and filename if necessary + run: cat coverage-html/SummaryGithub.md >> $GITHUB_STEP_SUMMARY + shell: bash publish: runs-on: ubuntu-latest From 0202ef19871b45c02af4d55b77cd23d768631c91 Mon Sep 17 00:00:00 2001 From: Ber-kan Date: Wed, 22 Jan 2025 09:34:34 +0100 Subject: [PATCH 9/9] comment weggehaald --- .github/workflows/dotnet.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 5fff483..67e22bf 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -105,8 +105,7 @@ jobs: name: html-coverage-report path: ./coverage-html/ - - name: Publish coverage in build summary # Only applicable if 'MarkdownSummaryGithub' or one of the other Markdown report types is generated - #run: cat coveragereport/SummaryGithub.md >> $GITHUB_STEP_SUMMARY # Adjust path and filename if necessary + - name: Publish coverage in build summary # alleen mogelijk met MarkdownSummaryGithub run: cat coverage-html/SummaryGithub.md >> $GITHUB_STEP_SUMMARY shell: bash