Skip to content

Commit e00dab9

Browse files
committed
updated cross chekc action
1 parent 9df0a9f commit e00dab9

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.github/workflows/CrossChecks.yml

+1
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,4 @@ jobs:
7474
--os ${{ matrix.os }}
7575
--ccrepo https://github.com/${{ env.CROSS_CHECK_REPO_USER }}/${{ env.CROSS_CHECK_REPO_NAME}}
7676
--ccbranch ${{ env.CROSS_CHECK_BRANCH }}
77+
--skipnotcompliant true

cross_checks/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ optional arguments:
4949
--includefatals Include FMUs that have caused the cross check
5050
runner to fail and exit
5151
--skipnotcompliant Reject officially not compliant FMUs and don't
52-
excecute them
52+
execute them
5353
--commitrejected Also commit the result file for FMUs that
54-
hasn't been excecuted (e.g. officially not
54+
hasn't been executed (e.g. officially not
5555
compliant FMUs if they are not skipped)
5656
--commitfailed Also commit the result file for failed FMUs
5757
-h, --help show this help message and exit

cross_checks/cross_check.jl

+6-6
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ function main()
258258
os = "linux64"
259259
end
260260
includeFatals = parsed_args["includefatals"]
261-
skipnotcompliant = parsed_args["skipnotcompliant"]
261+
skipnotcompliant = haskey(ENV, "crosscheck_skipnotcompliant") ? parse(Bool, ENV["crosscheck_skipnotcompliant"]) : parsed_args["skipnotcompliant"]
262262
commitrejected = parsed_args["commitrejected"]
263263
commitfailed = parsed_args["commitfailed"]
264264

@@ -353,21 +353,21 @@ function main()
353353
# Write Summary of Cross Check run
354354
println("#################### Start FMI Cross check Summary ####################")
355355
println("\tTotal Cross checks:\t\t\t$(count(c -> (true), crossChecks))")
356-
println("\tSuccessful Cross checks:\t\t$(count(c -> (c.success), crossChecks))")
356+
println("\tSuccessful Cross checks:\t\t$(count(c -> (c.success === true), crossChecks))")
357357
println(
358-
"\tFailed Cross checks:\t\t\t$(count(c -> (!c.success && c.error === nothing && !c.skipped), crossChecks))",
358+
"\tFailed Cross checks:\t\t\t$(count(c -> (c.success === false && c.error === nothing && c.skipped === false), crossChecks))",
359359
)
360360
println(
361361
"\tCross checks with errors:\t\t$(count(c -> (c.error !== nothing), crossChecks))",
362362
)
363-
println("\tSkipped Cross checks:\t\t\t$(count(c -> (c.skipped), crossChecks))")
363+
println("\tSkipped Cross checks:\t\t\t$(count(c -> (c.skipped === true), crossChecks))")
364364
println("\tList of successful Cross checks")
365-
for (index, success) in enumerate(filter(c -> (c.success), crossChecks))
365+
for (index, success) in enumerate(filter(c -> (c.success === true), crossChecks))
366366
println("\u001B[32m\t\t$(index):\t$(success)\u001B[0m")
367367
end
368368
println("\tList of failed Cross checks")
369369
for (index, success) in enumerate(
370-
filter(c -> (!c.success && c.error === nothing && !c.skipped), crossChecks),
370+
filter(c -> (c.success === false && c.error === nothing && c.skipped === false), crossChecks),
371371
)
372372
println("\u001B[33m\t\t$(index):\t$(success)\u001B[0m")
373373
end

0 commit comments

Comments
 (0)