mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fixing bug where installers and sfx wouldn't be pushed to latest

Browse source
This commit is contained in:
Jonathan Miller 2016-05-02 10:32:28 -07:00
parent 7fb7a122c4
commit 6f435c0047
1 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

38
scripts/dotnet-cli-build/PublishTargets.cs
View file

@ -26,8 +26,6 @@ namespace Microsoft.DotNet.Cli.Build
private static string SharedFrameworkNugetVersion { get; set; } private static string SharedFrameworkNugetVersion { get; set; }
private static List<string> _latestBlobs;
[Target] [Target]
public static BuildTargetResult InitPublish(BuildTargetContext c) public static BuildTargetResult InitPublish(BuildTargetContext c)
{ {
@ -86,14 +84,17 @@ namespace Microsoft.DotNet.Cli.Build
try try
{ {
// Iterate over every blob in the latest version folder and copy it to the 'latest' folder // Copy the latest CLI bits
foreach (string blob in _latestBlobs) CopyBlobs($"{Channel}/Binaries/{CliNuGetVersion}/", targetContainer);
{
string targetUrl = $"{targetContainer}{Path.GetFileName(blob)}" // Copy the latest installer files
.Replace(CliNuGetVersion, "latest") CopyBlobs($"{Channel}/Installers/{CliNuGetVersion}/", $"{Channel}/Installers/Latest/");
.Replace(SharedFrameworkNugetVersion, "latest");
AzurePublisherTool.CopyBlob(blob.Replace("/dotnet/", ""), targetUrl); // Copy the shared framework installers
} CopyBlobs($"{Channel}/Installers/{SharedFrameworkNugetVersion}/", $"{Channel}/Installers/Latest/");
// Copy the shared framework
CopyBlobs($"{Channel}/Binaries/{SharedFrameworkNugetVersion}/", targetContainer);
// Generate the CLI and SDK Version text files // Generate the CLI and SDK Version text files
List<string> versionFiles = new List<string>() { "win.x86.version", "win.x64.version", "ubuntu.x64.version", "rhel.x64.version", "osx.x64.version", "debian.x64.version", "centos.x64.version" }; List<string> versionFiles = new List<string>() { "win.x86.version", "win.x64.version", "ubuntu.x64.version", "rhel.x64.version", "osx.x64.version", "debian.x64.version", "centos.x64.version" };
@ -114,6 +115,19 @@ namespace Microsoft.DotNet.Cli.Build
return c.Success(); return c.Success();
} }
private static void CopyBlobs(string sourceFolder, string destinationFolder)
{
foreach (string blob in AzurePublisherTool.ListBlobs(sourceFolder))
{
string source = blob.Replace("/dotnet/", "");
string targetName = Path.GetFileName(blob)
.Replace(CliNuGetVersion, "latest")
.Replace(SharedFrameworkNugetVersion, "latest");
string target = $"{destinationFolder}{targetName}";
AzurePublisherTool.CopyBlob(source, target);
}
}
private static bool CheckIfAllBuildsHavePublished() private static bool CheckIfAllBuildsHavePublished()
{ {
Dictionary<string, bool> badges = new Dictionary<string, bool>() Dictionary<string, bool> badges = new Dictionary<string, bool>()
@ -127,7 +141,7 @@ namespace Microsoft.DotNet.Cli.Build
{ "CentOS_x64", false } { "CentOS_x64", false }
}; };
_latestBlobs = new List<string>(AzurePublisherTool.ListBlobs($"{Channel}/Binaries/{CliNuGetVersion}/")); List<string> blobs = new List<string>(AzurePublisherTool.ListBlobs($"{Channel}/Binaries/{CliNuGetVersion}/"));
var config = Environment.GetEnvironmentVariable("CONFIGURATION"); var config = Environment.GetEnvironmentVariable("CONFIGURATION");
var versionBadgeName = $"{CurrentPlatform.Current}_{CurrentArchitecture.Current}"; var versionBadgeName = $"{CurrentPlatform.Current}_{CurrentArchitecture.Current}";
@ -136,7 +150,7 @@ namespace Microsoft.DotNet.Cli.Build
throw new ArgumentException("A new OS build was added without adding the moniker to the {nameof(badges)} lookup"); throw new ArgumentException("A new OS build was added without adding the moniker to the {nameof(badges)} lookup");
} }
foreach (string file in _latestBlobs) foreach (string file in blobs)
{ {
string name = Path.GetFileName(file); string name = Path.GetFileName(file);
string key = string.Empty; string key = string.Empty;