@@ -27,7 +27,6 @@ var artifactsDir = Directory("artifacts"); // build artifacts
27
27
var artifactsForUnitTestsDir = artifactsDir + Directory ( "UnitTests" ) ;
28
28
var unitTestAssemblies = @"./test/Ocelot.UnitTests/Ocelot.UnitTests.csproj" ;
29
29
var minCodeCoverage = 0.80d ;
30
- var coverallsRepoToken = "OCELOT_COVERALLS_TOKEN" ;
31
30
var coverallsRepo = "https://coveralls.io/github/ThreeMammals/Ocelot" ;
32
31
33
32
// acceptance testing
@@ -515,27 +514,30 @@ Task("UnitTests")
515
514
Information ( "#=============================" ) ;
516
515
if ( IsRunningInCICD ( ) && IsMainOrDevelop ( ) )
517
516
{
518
- var repoToken = EnvironmentVariable ( coverallsRepoToken ) ;
517
+ var repoToken = EnvironmentVariable ( "OCELOT_COVERALLS_TOKEN" ) ;
519
518
if ( string . IsNullOrEmpty ( repoToken ) )
520
519
{
521
- var err = $ "# Coveralls repo token not found. Set environment variable: { coverallsRepoToken } !! !";
520
+ var err = "# Coveralls repo token was not found! Set environment variable: OCELOT_COVERALLS_TOKEN !" ;
522
521
Warning ( err ) ;
523
522
throw new Exception ( err ) ;
524
523
}
525
- else
524
+ Information ( $ "# Uploading test coverage to { coverallsRepo } ") ;
525
+ var gitHEAD = string . Join ( string . Empty , GitHelper ( "rev-parse HEAD" ) ) ; // git rev-parse HEAD
526
+ Information ( $ "# HEAD commit is { gitHEAD } ") ;
527
+ // git log -1 --pretty=format:'%an <%ae>'
528
+ var gitAuthor = string . Join ( string . Empty , GitHelper ( "log -1 --pretty=format:%an" ) ) ;
529
+ var gitEmail = string . Join ( string . Empty , GitHelper ( "log -1 --pretty=format:%ae" ) ) ;
530
+ var gitBranch = GetGitBranch ( ) ;
531
+ var gitMessage = string . Join ( string . Empty , GitHelper ( "log -1 --pretty=format:%s" ) ) ;
532
+ CoverallsNet ( coverageSummaryFile , CoverallsNetReportType . OpenCover , new CoverallsNetSettings ( )
526
533
{
527
- Information ( $ "# Uploading test coverage to { coverallsRepo } ") ;
528
- // CoverallsNet(coverageSummaryFile, CoverallsNetReportType.OpenCover, new CoverallsNetSettings()
529
- // {
530
- // RepoToken = repoToken
531
- // });
532
- Warning ( $@ "# Uploading is disabled due to the following reasons:
533
- # - App: /root/project/tools/csmacnz.Coveralls
534
- # - Framework: 'Microsoft.NETCore.App', version '6.0.0' (x64)
535
- # Upgrading csmacnz.Coveralls package to .NET 8-9 is required!!!
536
- # Repo: https://github.com/csmacnz/coveralls.net
537
- # Coveralls Language Integrations > .Net : https://docs.coveralls.io/dot-net" ) ;
538
- }
534
+ RepoToken = repoToken ,
535
+ CommitAuthor = gitAuthor ,
536
+ CommitBranch = gitBranch ,
537
+ CommitEmail = gitEmail ,
538
+ CommitId = gitHEAD ,
539
+ CommitMessage = gitMessage ,
540
+ } ) ;
539
541
}
540
542
else
541
543
{
@@ -545,7 +547,6 @@ Task("UnitTests")
545
547
var sequenceCoverage = XmlPeek ( coverageSummaryFile , "//coverage/@line-rate" ) ;
546
548
var branchCoverage = XmlPeek ( coverageSummaryFile , "//coverage/@line-rate" ) ;
547
549
Information ( "# Sequence Coverage: " + sequenceCoverage ) ;
548
-
549
550
if ( double . Parse ( sequenceCoverage ) < minCodeCoverage )
550
551
{
551
552
var whereToCheck = ! IsRunningInCICD ( ) ? coverallsRepo : artifactsForUnitTestsDir ;
0 commit comments