Skip to content

Commit 31a8a72

Browse files
committed
(build) install local tools only for docs and release stages
1 parent 5b07582 commit 31a8a72

File tree

8 files changed

+22
-26
lines changed

8 files changed

+22
-26
lines changed

build/artifacts/Program.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@
77
.UseLifetime<BuildLifetime>()
88
.UseTaskLifetime<BuildTaskLifetime>()
99
.UseRootDirectory()
10-
.InstallToolsFromRootManifest()
1110
.Run(args);

build/build/Program.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77
.UseLifetime<BuildLifetime>()
88
.UseTaskLifetime<BuildTaskLifetime>()
99
.UseRootDirectory()
10-
.InstallToolsFromRootManifest()
1110
.InstallNugetTool(Tools.CodecovUploaderCmd, Tools.Versions[Tools.CodecovUploaderCmd])
1211
.Run(args);

build/common/Addins/GitVersion/GitVersionSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public sealed class GitVersionSettings : ToolSettings
1313
/// <summary>
1414
/// Gets or sets the output type.
1515
/// </summary>
16-
public HashSet<GitVersionOutput> OutputTypes { get; set; } = new() { GitVersionOutput.Json };
16+
public HashSet<GitVersionOutput> OutputTypes { get; set; } = [GitVersionOutput.Json];
1717

1818
/// <summary>
1919
/// Gets or sets a value indicating whether to update all the AssemblyInfo files.

build/common/Lifetime/BuildLifetimeBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public override void Setup(T context, ISetupContext info)
3232
}
3333
var gitVersionSettings = new GitVersionSettings
3434
{
35-
OutputTypes = new() { GitVersionOutput.Json, GitVersionOutput.BuildServer },
35+
OutputTypes = [GitVersionOutput.Json, GitVersionOutput.BuildServer],
3636
ToolPath = context.Tools.Resolve(new[] { "dotnet.exe", "dotnet" }),
3737
ArgumentCustomization = args => args.Prepend(context.GetGitVersionDotnetToolLocation()?.FullPath ?? throw new FileNotFoundException("Failed to locate the Release build of gitversion.dll in ./tools/gitversion. Try running \"./build.ps1 -Stage build -Target BuildPrepare\""))
3838
};

build/common/Utilities/Constants.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ public class Constants
1818
public const string DefaultBranch = "main";
1919
public const string DefaultConfiguration = "Release";
2020

21-
public static readonly Architecture[] ArchToBuild = { Architecture.Amd64, Architecture.Arm64 };
22-
public static readonly string[] VersionsToBuild = { Version60, Version70, Version80 };
23-
public static readonly string[] Frameworks = { NetVersion60, NetVersion70, NetVersion80 };
21+
public static readonly Architecture[] ArchToBuild = [Architecture.Amd64, Architecture.Arm64];
22+
public static readonly string[] VersionsToBuild = [Version60, Version70, Version80];
23+
public static readonly string[] Frameworks = [NetVersion60, NetVersion70, NetVersion80];
2424

25-
public static readonly string[] DistrosToSkipForArtifacts = Array.Empty<string>();
26-
public static readonly string[] DistrosToSkipForDocker = Array.Empty<string>();
25+
public static readonly string[] DistrosToSkipForArtifacts = [];
26+
public static readonly string[] DistrosToSkipForDocker = [];
2727

2828
public const string DockerBaseImageName = "gittools/build-images";
2929
public const string DockerImageName = "gittools/gitversion";
@@ -49,15 +49,15 @@ public class Constants
4949
public const string AlpineLatest = Alpine318;
5050

5151
public static readonly string[] DockerDistrosToBuild =
52-
{
52+
[
5353
Alpine317,
5454
Alpine318,
5555
CentosStream8,
5656
Debian11,
5757
Fedora37,
5858
Ubuntu2004,
5959
Ubuntu2204
60-
};
60+
];
6161
public const string NugetOrgUrl = "https://api.nuget.org/v3/index.json";
6262
public const string GithubPackagesUrl = "https://nuget.pkg.github.com/gittools/index.json";
6363
public const string ChocolateyUrl = "https://push.chocolatey.org/";

build/common/Utilities/DockerContextExtensions.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ public static void DockerBuildImage(this BuildContextBase context, DockerImage d
5050
Rm = true,
5151
Tag = tags.ToArray(),
5252
File = workDir.CombineWithFilePath("Dockerfile").FullPath,
53-
BuildArg = new[]
54-
{
53+
BuildArg =
54+
[
5555
"contentFolder=/content",
5656
$"REGISTRY={registry}",
5757
$"DOTNET_VERSION={targetFramework}",
5858
$"DISTRO={distro}",
5959
$"VERSION={context.Version.NugetVersion}"
60-
},
60+
],
6161
Pull = true,
6262
Platform = string.Join(",", platforms),
6363
};
@@ -203,31 +203,31 @@ private static DockerContainerRunSettings GetDockerRunSettings(this BuildContext
203203
var settings = new DockerContainerRunSettings
204204
{
205205
Rm = true,
206-
Volume = new[]
207-
{
206+
Volume =
207+
[
208208
$"{currentDir}:{root}/repo",
209209
$"{currentDir}/tests/scripts:{root}/scripts",
210210
$"{currentDir}/artifacts/packages/nuget:{root}/nuget",
211-
$"{currentDir}/artifacts/packages/native:{root}/native",
212-
},
211+
$"{currentDir}/artifacts/packages/native:{root}/native"
212+
],
213213
Platform = $"linux/{arch.ToString().ToLower()}"
214214
};
215215

216216
if (context.IsAzurePipelineBuild)
217217
{
218-
settings.Env = new[]
219-
{
218+
settings.Env =
219+
[
220220
"TF_BUILD=true",
221221
$"BUILD_SOURCEBRANCH={context.EnvironmentVariable("BUILD_SOURCEBRANCH")}"
222-
};
222+
];
223223
}
224224
if (context.IsGitHubActionsBuild)
225225
{
226-
settings.Env = new[]
227-
{
226+
settings.Env =
227+
[
228228
"GITHUB_ACTIONS=true",
229229
$"GITHUB_REF={context.EnvironmentVariable("GITHUB_REF")}"
230-
};
230+
];
231231
}
232232

233233
return settings;

build/docker/Program.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@
77
.UseLifetime<BuildLifetime>()
88
.UseTaskLifetime<BuildTaskLifetime>()
99
.UseRootDirectory()
10-
.InstallToolsFromRootManifest()
1110
.Run(args);

build/publish/Program.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@
77
.UseLifetime<BuildLifetime>()
88
.UseTaskLifetime<BuildTaskLifetime>()
99
.UseRootDirectory()
10-
.InstallToolsFromRootManifest()
1110
.Run(args);

0 commit comments

Comments
 (0)