From 9ffe40164c016968041fc724126ccaa30f1319d0 Mon Sep 17 00:00:00 2001 From: Bruno Massa Date: Fri, 30 Jun 2023 14:40:25 -0300 Subject: [PATCH 1/4] chore: reorganize test --- .build.Nuke/Build.Test.cs | 33 +++++++++++++++++---------------- test/Parser/YAMLParserTests.cs | 2 +- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.build.Nuke/Build.Test.cs b/.build.Nuke/Build.Test.cs index 7ade196..daa4ec3 100644 --- a/.build.Nuke/Build.Test.cs +++ b/.build.Nuke/Build.Test.cs @@ -18,35 +18,36 @@ namespace SuCoS; /// sealed partial class Build : NukeBuild { - AbsolutePath TestDLL => testDirectory / "bin" / "Debug" / "net7.0"; AbsolutePath testDirectory => RootDirectory / "test"; - AbsolutePath TestSiteDirectory => RootDirectory / "test" / ".TestSites"; - AbsolutePath TestOutputDirectory => TestDLL / ".TestSites"; + AbsolutePath testDLLDirectory => testDirectory / "bin" / "Debug" / "net7.0"; + AbsolutePath testSiteSourceDirectory => RootDirectory / "test" / ".TestSites"; + AbsolutePath testSiteDestinationDirectory => testDLLDirectory / ".TestSites"; + AbsolutePath testAssembly => testDLLDirectory / "test.dll"; AbsolutePath coverageDirectory => RootDirectory / "coverage-results"; - AbsolutePath ReportDirectory => coverageDirectory / "report"; - AbsolutePath CoverageResultDirectory => coverageDirectory / "coverage"; - AbsolutePath CoverageResultFile => CoverageResultDirectory / "coverage.xml"; - AbsolutePath CoverageSummaryResultFile => ReportDirectory / "Summary.txt"; + AbsolutePath coverageResultDirectory => coverageDirectory / "coverage"; + AbsolutePath coverageResultFile => coverageResultDirectory / "coverage.xml"; + AbsolutePath coverageReportDirectory => coverageDirectory / "report"; + AbsolutePath coverageReportSummaryDirectory => coverageReportDirectory / "Summary.txt"; Target PrepareTestFiles => _ => _ .After(Clean) .Executes(() => { - TestOutputDirectory.CreateOrCleanDirectory(); - CopyDirectoryRecursively(TestSiteDirectory, TestOutputDirectory, DirectoryExistsPolicy.Merge); + testSiteDestinationDirectory.CreateOrCleanDirectory(); + CopyDirectoryRecursively(testSiteSourceDirectory, testSiteDestinationDirectory, DirectoryExistsPolicy.Merge); }); Target Test => _ => _ .DependsOn(Compile, PrepareTestFiles) .Executes(() => { - CoverageResultDirectory.CreateDirectory(); + coverageResultDirectory.CreateDirectory(); Coverlet(s => s .SetTarget("dotnet") .SetTargetArgs("test --no-build --no-restore") - .SetAssembly(TestDLL / "test.dll") + .SetAssembly(testAssembly) // .SetThreshold(75) - .SetOutput(CoverageResultFile) + .SetOutput(coverageResultFile) .SetFormat(CoverletOutputFormat.opencover)); }); @@ -54,13 +55,13 @@ sealed partial class Build : NukeBuild .DependsOn(Test) .Executes(() => { - ReportDirectory.CreateDirectory(); + coverageReportDirectory.CreateDirectory(); ReportGenerator(s => s - .SetTargetDirectory(ReportDirectory) + .SetTargetDirectory(coverageReportDirectory) .SetReportTypes(new ReportTypes[] { ReportTypes.Html, ReportTypes.TextSummary }) - .SetReports(CoverageResultFile) + .SetReports(coverageResultFile) ); - var summaryText = CoverageSummaryResultFile.ReadAllLines(); + var summaryText = coverageReportSummaryDirectory.ReadAllLines(); Log.Information(string.Join(Environment.NewLine, summaryText)); }); } diff --git a/test/Parser/YAMLParserTests.cs b/test/Parser/YAMLParserTests.cs index 7a0250b..06eb559 100644 --- a/test/Parser/YAMLParserTests.cs +++ b/test/Parser/YAMLParserTests.cs @@ -179,7 +179,7 @@ customParam: Custom Value site.Object.PostProcessFrontMatter(frontmatter!); // Asset - Assert.Equal(DateTime.Parse("2023-07-01"), frontmatter?.Date); + Assert.Equal(DateTime.Parse("2023-07-01", CultureInfo.InvariantCulture), frontmatter?.Date); } [Fact] -- GitLab From 39dc6572bb32fd285a7295cf0b0507c241e3987f Mon Sep 17 00:00:00 2001 From: Bruno Massa Date: Fri, 30 Jun 2023 15:08:13 -0300 Subject: [PATCH 2/4] test: change to cobertura format --- .build.Nuke/Build.Test.cs | 2 +- .gitlab-ci.yml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.build.Nuke/Build.Test.cs b/.build.Nuke/Build.Test.cs index daa4ec3..937b3f6 100644 --- a/.build.Nuke/Build.Test.cs +++ b/.build.Nuke/Build.Test.cs @@ -48,7 +48,7 @@ sealed partial class Build : NukeBuild .SetAssembly(testAssembly) // .SetThreshold(75) .SetOutput(coverageResultFile) - .SetFormat(CoverletOutputFormat.opencover)); + .SetFormat(CoverletOutputFormat.cobertura)); }); public Target TestReport => _ => _ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f0ab162..25d388f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,11 +38,15 @@ test: ./build.sh TestReport Publish \ --configuration "Debug" \ --publish-directory "./publish" - coverage: '/^Line coverage: (\d+.\d+)%/' + coverage: '/^ Line coverage: (\d*.\d*)%/' artifacts: paths: - coverage-results/report/* - publish/* + reports: + coverage_report: + coverage_format: cobertura + path: coverage-results/report/coverage.xml # check if there is new commits, if so, create a tag and a release # this will trigger the publish stage "publish" -- GitLab From 7de530fc352c8ea6809b45e9c28c07939c190566 Mon Sep 17 00:00:00 2001 From: Bruno Massa Date: Fri, 30 Jun 2023 15:13:29 -0300 Subject: [PATCH 3/4] fix: coverage_report path --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 25d388f..72dbdd9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,7 +46,7 @@ test: reports: coverage_report: coverage_format: cobertura - path: coverage-results/report/coverage.xml + path: coverage-results/coverage/coverage.xml # check if there is new commits, if so, create a tag and a release # this will trigger the publish stage "publish" -- GitLab From 31c1e6254a8f1fa031a0d65073925a400424c49a Mon Sep 17 00:00:00 2001 From: Bruno Massa Date: Fri, 30 Jun 2023 15:19:05 -0300 Subject: [PATCH 4/4] ci: commented out the unused nuget cache --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 72dbdd9..6bd07c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,9 +19,9 @@ variables: PUBLISH_SINGLE_FILE: "true" PUBLISH_TRIMMED: "false" -cache: - paths: - - "**/.nuget/packages" +# cache: +# paths: +# - "**/.nuget/packages" services: - docker:dind -- GitLab