Skip to content

Commit 3277269

Browse files
arturcicarturcic
committed
(build) small changes
1 parent b9bc3f0 commit 3277269

File tree

5 files changed

+33
-24
lines changed

5 files changed

+33
-24
lines changed

‎build/pack.cake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Task("Test")
3838
.IsDependentOn("Build")
3939
.Does<BuildParameters>((parameters) =>
4040
{
41-
var frameworks = new[] { parameters.CoreFxVersion, parameters.FullFxVersion };
41+
var frameworks = new[] { parameters.CoreFxVersion21, parameters.FullFxVersion };
4242
var testResultsPath = parameters.Paths.Directories.TestResultsOutput;
4343

4444
foreach(var framework in frameworks)
@@ -125,10 +125,10 @@ Task("Copy-Files")
125125
.Does<BuildParameters>((parameters) =>
126126
{
127127
// .NET Core
128-
var coreFxDir = parameters.Paths.Directories.ArtifactsBinCoreFx.Combine("tools");
128+
var coreFxDir = parameters.Paths.Directories.ArtifactsBinCoreFx21.Combine("tools");
129129
DotNetCorePublish("./src/GitVersionExe/GitVersionExe.csproj", new DotNetCorePublishSettings
130130
{
131-
Framework = parameters.CoreFxVersion,
131+
Framework = parameters.CoreFxVersion21,
132132
NoRestore = true,
133133
Configuration = parameters.Configuration,
134134
OutputDirectory = coreFxDir,
@@ -137,7 +137,7 @@ Task("Copy-Files")
137137

138138
// Copy license & Copy GitVersion.XML (since publish does not do this anymore)
139139
CopyFileToDirectory("./LICENSE", coreFxDir);
140-
CopyFileToDirectory($"./src/GitVersionExe/bin/{parameters.Configuration}/{parameters.CoreFxVersion}/GitVersion.xml", coreFxDir);
140+
CopyFileToDirectory($"./src/GitVersionExe/bin/{parameters.Configuration}/{parameters.CoreFxVersion21}/GitVersion.xml", coreFxDir);
141141

142142
// .NET Framework
143143
DotNetCorePublish("./src/GitVersionExe/GitVersionExe.csproj", new DotNetCorePublishSettings
@@ -162,7 +162,7 @@ Task("Copy-Files")
162162
// .NET Core
163163
DotNetCorePublish("./src/GitVersionTask/GitVersionTask.csproj", new DotNetCorePublishSettings
164164
{
165-
Framework = parameters.CoreFxVersion,
165+
Framework = parameters.CoreFxVersion21,
166166
NoBuild = true,
167167
NoRestore = true,
168168
Configuration = parameters.Configuration,
@@ -325,7 +325,7 @@ Task("Zip-Files")
325325
Zip(cmdlineDir, parameters.Paths.Files.ZipArtifactPathDesktop, fullFxFiles);
326326

327327
// .NET Core
328-
var coreFxDir = parameters.Paths.Directories.ArtifactsBinCoreFx.Combine("tools");
328+
var coreFxDir = parameters.Paths.Directories.ArtifactsBinCoreFx21.Combine("tools");
329329
var coreclrFiles = GetFiles(coreFxDir.FullPath + "/**/*");
330330
Zip(coreFxDir, parameters.Paths.Files.ZipArtifactPathCoreClr, coreclrFiles);
331331
});

‎build/utils/docker.cake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ void DockerBuild(DockerImage dockerImage, BuildParameters parameters)
2929
var workDir = DirectoryPath.FromString($"./src/Docker");
3030

3131
var sourceDir = targetframework.StartsWith("netcoreapp")
32-
? parameters.Paths.Directories.ArtifactsBinCoreFx.Combine("tools")
32+
? parameters.Paths.Directories.ArtifactsBinCoreFx21.Combine("tools")
3333
: parameters.Paths.Directories.ArtifactsBinFullFxCmdline.Combine("tools");
3434

3535
CopyDirectory(sourceDir, workDir.Combine("content"));
@@ -130,7 +130,7 @@ string[] GetDockerTags(DockerImage dockerImage, BuildParameters parameters) {
130130
$"{name}:{parameters.Version.SemVersion}-{os}-{distro}-{targetframework}",
131131
};
132132

133-
if (distro == "debian-9" && targetframework == parameters.CoreFxVersion || distro == "nanoserver-1809") {
133+
if (distro == "debian-9" && targetframework == parameters.CoreFxVersion21 || distro == "nanoserver-1809") {
134134
tags.AddRange(new[] {
135135
$"{name}:{parameters.Version.Version}-{os}",
136136
$"{name}:{parameters.Version.SemVersion}-{os}",

‎build/utils/parameters.cake

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ public class BuildParameters
88
public string Target { get; private set; }
99
public string Configuration { get; private set; }
1010

11-
public string CoreFxVersion { get; private set; } = "netcoreapp2.1";
11+
public const string MainRepoOwner = "gittools";
12+
public const string MainRepoName = "GitVersion";
13+
public string CoreFxVersion21 { get; private set; } = "netcoreapp2.1";
1214
public string FullFxVersion { get; private set; } = "net472";
1315

1416
public string DockerDistro { get; private set; }
@@ -132,7 +134,7 @@ public class BuildParameters
132134

133135
PackagesBuildMap = new Dictionary<string, DirectoryPath>
134136
{
135-
["GitVersion.CommandLine.DotNetCore"] = Paths.Directories.ArtifactsBinCoreFx,
137+
["GitVersion.CommandLine.DotNetCore"] = Paths.Directories.ArtifactsBinCoreFx21,
136138
["GitVersion.CommandLine"] = Paths.Directories.ArtifactsBinFullFxCmdline,
137139
["GitVersion.Portable"] = Paths.Directories.ArtifactsBinFullFxPortable,
138140
};
@@ -194,13 +196,13 @@ public class BuildParameters
194196

195197
context.Information("Repository Name: {0}" , repositoryName);
196198

197-
return !string.IsNullOrWhiteSpace(repositoryName) && StringComparer.OrdinalIgnoreCase.Equals("gittools/gitversion", repositoryName);
199+
return !string.IsNullOrWhiteSpace(repositoryName) && StringComparer.OrdinalIgnoreCase.Equals($"{BuildParameters.MainRepoOwner}/{BuildParameters.MainRepoName}", repositoryName);
198200
}
199201

200202
private static bool IsOnMainBranch(ICakeContext context)
201203
{
202204
var buildSystem = context.BuildSystem();
203-
string repositoryBranch = null;
205+
string repositoryBranch = ExecGitCmd(context, "rev-parse --abbrev-ref HEAD").Single();
204206
if (buildSystem.IsRunningOnAppVeyor)
205207
{
206208
repositoryBranch = buildSystem.AppVeyor.Environment.Repository.Branch;
@@ -221,10 +223,9 @@ public class BuildParameters
221223

222224
private static bool IsBuildTagged(ICakeContext context)
223225
{
224-
var gitPath = context.Tools.Resolve(context.IsRunningOnWindows() ? "git.exe" : "git");
225-
context.StartProcess(gitPath, new ProcessSettings { Arguments = "rev-parse --verify HEAD", RedirectStandardOutput = true }, out var sha);
226-
context.StartProcess(gitPath, new ProcessSettings { Arguments = "tag --points-at " + sha.Single(), RedirectStandardOutput = true }, out var redirectedOutput);
226+
var sha = ExecGitCmd(context, "rev-parse --verify HEAD").Single();
227+
var isTagged = ExecGitCmd(context, "tag --points-at " + sha).Any();
227228

228-
return redirectedOutput.Any();
229+
return isTagged;
229230
}
230231
}

‎build/utils/paths.cake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ public class BuildPaths
3131
var artifactsBinFullFxILMergeDir = artifactsBinFullFxDir.Combine("il-merge");
3232
var artifactsBinFullFxPortableDir = artifactsBinFullFxDir.Combine("portable");
3333
var artifactsBinFullFxCmdlineDir = artifactsBinFullFxDir.Combine("cmdline");
34-
var artifactsBinCoreFxDir = artifactsBinDir.Combine(parameters.CoreFxVersion);
34+
var artifactsBinCoreFxDir = artifactsBinDir.Combine(parameters.CoreFxVersion21);
3535
var nugetRootDir = artifactsDir.Combine("nuget");
3636
var buildArtifactDir = artifactsDir.Combine("build-artifact");
37-
var testResultsOutputDir = artifactsDir.Combine("test-results");
37+
var testResultsOutputDir = artifactsDir.Combine("test-results");
3838

3939
var zipArtifactPathCoreClr = artifactsDir.CombineWithFilePath("GitVersion-bin-corefx-v" + semVersion + ".zip");
4040
var zipArtifactPathDesktop = artifactsDir.CombineWithFilePath("GitVersion-bin-fullfx-v" + semVersion + ".zip");
@@ -111,7 +111,7 @@ public class BuildDirectories
111111
public DirectoryPath ArtifactsBinFullFxPortable { get; private set; }
112112
public DirectoryPath ArtifactsBinFullFxCmdline { get; private set; }
113113
public DirectoryPath ArtifactsBinFullFxILMerge { get; private set; }
114-
public DirectoryPath ArtifactsBinCoreFx { get; private set; }
114+
public DirectoryPath ArtifactsBinCoreFx21 { get; private set; }
115115
public ICollection<DirectoryPath> ToClean { get; private set; }
116116

117117
public BuildDirectories(
@@ -124,7 +124,7 @@ public class BuildDirectories
124124
DirectoryPath artifactsBinFullFxPortableDir,
125125
DirectoryPath artifactsBinFullFxCmdlineDir,
126126
DirectoryPath artifactsBinFullFxILMergeDir,
127-
DirectoryPath artifactsBinCoreFxDir
127+
DirectoryPath artifactsBinCoreFx21Dir
128128
)
129129
{
130130
Artifacts = artifactsDir;
@@ -136,7 +136,7 @@ public class BuildDirectories
136136
ArtifactsBinFullFxPortable = artifactsBinFullFxPortableDir;
137137
ArtifactsBinFullFxCmdline = artifactsBinFullFxCmdlineDir;
138138
ArtifactsBinFullFxILMerge = artifactsBinFullFxILMergeDir;
139-
ArtifactsBinCoreFx = artifactsBinCoreFxDir;
139+
ArtifactsBinCoreFx21 = artifactsBinCoreFx21Dir;
140140
ToClean = new[] {
141141
Artifacts,
142142
BuildArtifact,
@@ -147,7 +147,7 @@ public class BuildDirectories
147147
ArtifactsBinFullFxPortable,
148148
ArtifactsBinFullFxCmdline,
149149
ArtifactsBinFullFxILMerge,
150-
ArtifactsBinCoreFx
150+
ArtifactsBinCoreFx21
151151
};
152152
}
153153
}

‎build/utils/utils.cake

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ void SetRubyGemPushApiKey(string apiKey)
3636

3737
GitVersion GetVersion(BuildParameters parameters)
3838
{
39-
var dllFilePath = $"./artifacts/*/bin/{parameters.CoreFxVersion}/tools/GitVersion.dll";
39+
var dllFilePath = $"./artifacts/*/bin/{parameters.CoreFxVersion21}/tools/GitVersion.dll";
4040
var dllFile = GetFiles(dllFilePath).FirstOrDefault();
4141
if (dllFile == null)
4242
{
4343
Warning("Dogfood GitVersion to get information");
4444
Build(parameters);
45-
dllFilePath = $"./src/GitVersionExe/bin/{parameters.Configuration}/{parameters.CoreFxVersion}/GitVersion.dll";
45+
dllFilePath = $"./src/GitVersionExe/bin/{parameters.Configuration}/{parameters.CoreFxVersion21}/GitVersion.dll";
4646
dllFile = GetFiles(dllFilePath).FirstOrDefault();
4747
}
4848

@@ -172,3 +172,11 @@ public static bool IsEnabled(ICakeContext context, string envVar, bool nullOrEmp
172172

173173
return string.IsNullOrWhiteSpace(value) ? nullOrEmptyAsEnabled : bool.Parse(value);
174174
}
175+
176+
public static List<string> ExecGitCmd(ICakeContext context, string cmd)
177+
{
178+
var gitPath = context.Tools.Resolve(context.IsRunningOnWindows() ? "git.exe" : "git");
179+
context.StartProcess(gitPath, new ProcessSettings { Arguments = cmd, RedirectStandardOutput = true }, out var redirectedOutput);
180+
181+
return redirectedOutput.ToList();
182+
}

0 commit comments

Comments
 (0)