Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Let's try this way #386

Merged
merged 14 commits into from
Sep 26, 2023
Merged

Let's try this way #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bea3595
Let's try this way
Riduidel Sep 13, 2023
2d0ec11
Merge branch 'main' into bugfixes/385_use_dynamic_cobertura_detection
Riduidel Sep 13, 2023
7f25163
Let's try this way
Riduidel Sep 13, 2023
67f61ec
A small GitHub Action bug
Riduidel Sep 13, 2023
9f7e527
One more issue
Riduidel Sep 13, 2023
dddc9e3
Grmbl
Riduidel Sep 13, 2023
e2f6c2b
One more try
Riduidel Sep 13, 2023
fbfb698
Not even able to write something good
Riduidel Sep 13, 2023
245e53f
Let's try this way
Riduidel Sep 25, 2023
eee98b1
Merge branch 'main' into bugfixes/385_use_dynamic_cobertura_detection
Riduidel Sep 26, 2023
b6d582f
Isn't that the merge?
Riduidel Sep 26, 2023
cedfc3e
Seems like the most modern way to do that
Riduidel Sep 26, 2023
be70e34
Didn't knew I could use a glob pattern here
Riduidel Sep 26, 2023
945493b
Obviously, yaml is in the way
Riduidel Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions .github/workflows/on_pull_request_push_run_test_and_coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,13 @@ jobs:
env:
TOKEN_FOR_GITHUB: ${{ secrets.TOKEN_FOR_GITHUB }}
TOKEN_FOR_GITLAB: ${{ secrets.TOKEN_FOR_GITLAB }}
# Seen on https://stackoverflow.com/a/70405596/15619
- name: Add coverage to PR
id: jacoco
uses: madrapps/jacoco-report@v1.3
uses: madrapps/jacoco-report@v1.6.1
with:
paths: |
${{ github.workspace }}/base/target/site/jacoco/jacoco.xml,
${{ github.workspace }}/architecture-documentation/target/site/jacoco/jacoco.xml,
${{ github.workspace }}/markdown-to-asciidoc/target/site/jacoco/jacoco.xml,
${{ github.workspace }}/maven-metadata-inferer/target/site/jacoco/jacoco.xml,
${{ github.workspace }}/sequence-diagram-generator/target/site/jacoco/jacoco.xml
token: ${{ secrets.GITHUB_TOKEN }}
paths: "**/target/site/jacoco/jacoco.xml"
token: "${{ secrets.GITHUB_TOKEN }}"
min-coverage-overall: 10
min-coverage-changed-files: 50
title: Current coverage (as computed by Jacoco)
Expand Down
3 changes: 2 additions & 1 deletion aadarchi-maven-plugin/src/it/1_from_workspace_dsl/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ Is there one line containing project version? And if so, does it contains the "p
def lines = logFile.readLines()
// Now filter that collection
def inStep = lines.findAll { it.contains "ArchitectureEnhancer" }
assert inStep.size>1
logger.info "Found lines ${inStep}"
assert inStep.size()>1
// We have log lines, but do we also have generated content ?
File structurizrOutput = new File(basedir, "target/structurizr")
assert structurizrOutput.exists() && structurizrOutput.isDirectory()
Expand Down