Skip to content

Commit

Permalink
Update build script
Browse files Browse the repository at this point in the history
  • Loading branch information
Jericho committed Nov 30, 2019
1 parent 5036990 commit 5c0481c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Expand Up @@ -4,7 +4,7 @@ init:

# Build script
build_script:
- ps: .\build.ps1 --bootstrap
- ps: .\build.ps1 -bootstrap
- ps: .\build.ps1 -Target AppVeyor

# Tests
Expand Down
23 changes: 13 additions & 10 deletions build.cake
Expand Up @@ -51,20 +51,21 @@ var outputDir = "./artifacts/";
var codeCoverageDir = $"{outputDir}CodeCoverage/";
var benchmarkDir = $"{outputDir}Benchmark/";

var unitTestsProject = sourceFolder + libraryName + ".UnitTests/" + libraryName + ".UnitTests.csproj";
var benchmarkProject = sourceFolder + libraryName + ".Benchmark/" + libraryName + ".Benchmark.csproj";
var unitTestsProject = $"{sourceFolder}{libraryName}.UnitTests/{libraryName}.UnitTests.csproj";
var benchmarkProject = $"{sourceFolder}{libraryName}.Benchmark/{libraryName}.Benchmark.csproj";

var versionInfo = GitVersion(new GitVersionSettings() { OutputType = GitVersionOutput.Json });
var milestone = versionInfo.MajorMinorPatch;
var cakeVersion = typeof(ICakeContext).Assembly.GetName().Version.ToString();
var isLocalBuild = BuildSystem.IsLocalBuild;
var isMainBranch = StringComparer.OrdinalIgnoreCase.Equals("master", BuildSystem.AppVeyor.Environment.Repository.Branch);
var isMainRepo = StringComparer.OrdinalIgnoreCase.Equals(gitHubRepoOwner + "/" + gitHubRepo, BuildSystem.AppVeyor.Environment.Repository.Name);
var isMainRepo = StringComparer.OrdinalIgnoreCase.Equals($"{gitHubRepoOwner}/{gitHubRepo}", BuildSystem.AppVeyor.Environment.Repository.Name);
var isPullRequest = BuildSystem.AppVeyor.Environment.PullRequest.IsPullRequest;
var isTagged = (
BuildSystem.AppVeyor.Environment.Repository.Tag.IsTag &&
!string.IsNullOrWhiteSpace(BuildSystem.AppVeyor.Environment.Repository.Tag.Name)
);
var isBenchmarkPresent = FileExists(benchmarkProject);
///////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -108,15 +109,15 @@ Setup(context =>
if (!string.IsNullOrEmpty(gitHubToken))
{
Information("GitHub Info:\r\n\tRepo: {0}\r\n\tUserName: {1}\r\n\tToken: {2}",
gitHubRepoOwner + "/" + gitHubRepo,
$"{gitHubRepoOwner}/{gitHubRepo}",
gitHubUserName,
new string('*', gitHubToken.Length)
);
}
else
{
Information("GitHub Info:\r\n\tRepo: {0}\r\n\tUserName: {1}\r\n\tPassword: {2}",
gitHubRepoOwner + "/" + gitHubRepo,
$"{gitHubRepoOwner}/{gitHubRepo}",
gitHubUserName,
string.IsNullOrEmpty(gitHubPassword) ? "[NULL]" : new string('*', gitHubPassword.Length)
);
Expand Down Expand Up @@ -151,8 +152,8 @@ Task("Clean")
{
// Clean solution directories.
Information("Cleaning {0}", sourceFolder);
CleanDirectories(sourceFolder + "*/bin/" + configuration);
CleanDirectories(sourceFolder + "*/obj/" + configuration);
CleanDirectories($"{sourceFolder}*/bin/{configuration}");
CleanDirectories($"{sourceFolder}*/obj/{configuration}");
// Clean previous artifacts
Information("Cleaning {0}", outputDir);
Expand Down Expand Up @@ -209,7 +210,7 @@ Task("Run-Code-Coverage")
});
OpenCover(testAction,
codeCoverageDir + "coverage.xml",
$"{codeCoverageDir}coverage.xml",
new OpenCoverSettings
{
OldStyle = true,
Expand All @@ -225,15 +226,15 @@ Task("Run-Code-Coverage")
Task("Upload-Coverage-Result")
.Does(() =>
{
CoverallsIo(codeCoverageDir + "coverage.xml");
CoverallsIo($"{codeCoverageDir}coverage.xml");
});

Task("Generate-Code-Coverage-Report")
.IsDependentOn("Run-Code-Coverage")
.Does(() =>
{
ReportGenerator(
codeCoverageDir + "coverage.xml",
$"{codeCoverageDir}coverage.xml",
codeCoverageDir,
new ReportGeneratorSettings() {
ClassFilters = new[] { "*.UnitTests*" }
Expand Down Expand Up @@ -378,6 +379,7 @@ Task("Publish-GitHub-Release")

Task("Generate-Benchmark-Report")
.IsDependentOn("Build")
.WithCriteria(isBenchmarkPresent)
.Does(() =>
{
var publishDirectory = $"{benchmarkDir}Publish/";
Expand Down Expand Up @@ -409,6 +411,7 @@ Task("Coverage")

Task("Benchmark")
.IsDependentOn("Generate-Benchmark-Report")
.WithCriteria(isBenchmarkPresent)
.Does(() =>
{
var htmlReport = GetFiles($"{benchmarkDir}results/*-report.html", new GlobberSettings { IsCaseSensitive = false }).FirstOrDefault();
Expand Down

0 comments on commit 5c0481c

Please sign in to comment.