From 2c95d7c67b45e46982775f429e127fa84d822beb Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 13 Feb 2017 12:31:55 +0900 Subject: [PATCH] Add ability to bootstrap the releases directory using github release API. --- osu.Desktop.Deploy/App.config | 10 +- osu.Desktop.Deploy/GitHubObject.cs | 13 ++ osu.Desktop.Deploy/Program.cs | 148 ++++++++++++++++--- osu.Desktop.Deploy/osu.Desktop.Deploy.csproj | 15 ++ osu.Desktop.Deploy/packages.config | 1 + 5 files changed, 163 insertions(+), 24 deletions(-) create mode 100644 osu.Desktop.Deploy/GitHubObject.cs diff --git a/osu.Desktop.Deploy/App.config b/osu.Desktop.Deploy/App.config index d740e88600..836f2237d6 100644 --- a/osu.Desktop.Deploy/App.config +++ b/osu.Desktop.Deploy/App.config @@ -1,6 +1,14 @@ - + + + + + + + + + \ No newline at end of file diff --git a/osu.Desktop.Deploy/GitHubObject.cs b/osu.Desktop.Deploy/GitHubObject.cs new file mode 100644 index 0000000000..f87de5cbdd --- /dev/null +++ b/osu.Desktop.Deploy/GitHubObject.cs @@ -0,0 +1,13 @@ +using Newtonsoft.Json; + +namespace osu.Desktop.Deploy +{ + internal class GitHubObject + { + [JsonProperty(@"id")] + public int Id; + + [JsonProperty(@"name")] + public string Name; + } +} \ No newline at end of file diff --git a/osu.Desktop.Deploy/Program.cs b/osu.Desktop.Deploy/Program.cs index 955f57765e..96d041a4c9 100644 --- a/osu.Desktop.Deploy/Program.cs +++ b/osu.Desktop.Deploy/Program.cs @@ -2,9 +2,11 @@ // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE using System; +using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; +using osu.Framework.IO.Network; namespace osu.Desktop.Deploy { @@ -20,7 +22,9 @@ namespace osu.Desktop.Deploy public static string ProjectName = "osu.Desktop"; public static string CodeSigningCert => Path.Combine(homeDir, "deanherbert.pfx"); - private static string codeSigningCmd => $"/a /f {CodeSigningCert} /p {codeSigningPassword} /t http://timestamp.comodoca.com/authenticode"; + const int keep_delta_count = 3; + + private static string codeSigningCmd => string.IsNullOrEmpty(codeSigningPassword) ? "" : $"-n \"/a /f {CodeSigningCert} /p {codeSigningPassword} /t http://timestamp.comodoca.com/authenticode\""; private static string homeDir => Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); @@ -28,68 +32,149 @@ namespace osu.Desktop.Deploy private static string stagingPath => Path.Combine(solutionPath, StagingFolder); private static string iconPath => Path.Combine(solutionPath, ProjectName, "lazer.ico"); + private static string nupkgFilename(string ver) => $"osulazer.{ver}.nupkg"; + private static string nupkgDistroFilename(string ver) => $"osulazer-{ver}-full.nupkg"; + private static string codeSigningPassword; public static void Main(string[] args) { findSolutionPath(); - if (Directory.Exists(StagingFolder)) - Directory.Delete(StagingFolder, true); - Directory.CreateDirectory(StagingFolder); - - string verBase = DateTime.Now.ToString("yyyy.Md."); - - int increment = 0; - if (!Directory.Exists(ReleasesFolder)) { Console.WriteLine("WARNING: No files found in the release directory. Make sure you want this."); Directory.CreateDirectory(ReleasesFolder); } - else + + Console.WriteLine("Checking github releases..."); + + var req = new JsonWebRequest>("https://api.github.com/repos/ppy/osu/releases"); + req.BlockingPerform(); + + if (req.ResponseObject.Count > 0) { - Console.WriteLine("Existing releases:"); - foreach (var l in File.ReadAllLines(Path.Combine(ReleasesFolder, "RELEASES"))) - Console.WriteLine(l); - Console.WriteLine(); + var release = req.ResponseObject[0]; + Console.WriteLine($"Last version pushed was {release.Name}"); + + if (!File.Exists(Path.Combine(ReleasesFolder, nupkgDistroFilename(release.Name)))) + { + Console.WriteLine("Not found locally; let's pull down last release data."); + + req = new JsonWebRequest>($"https://api.github.com/repos/ppy/osu/releases/{release.Id}/assets"); + req.BlockingPerform(); + + foreach (var asset in req.ResponseObject) + { + Console.WriteLine($"Downloading {asset.Name}..."); + var dl = new FileWebRequest(Path.Combine(ReleasesFolder, asset.Name), $"https://api.github.com/repos/ppy/osu/releases/assets/{asset.Id}"); + dl.BlockingPerform(); + } + } } + if (Directory.Exists(StagingFolder)) + Directory.Delete(StagingFolder, true); + Directory.CreateDirectory(StagingFolder); + + string verBase = DateTime.Now.ToString("yyyy.Md."); + int increment = 0; + //increment build number until we have a unique one. while (Directory.GetFiles(ReleasesFolder, $"*{verBase}{increment}*").Any()) increment++; - string ver = $"{verBase}{increment}"; + string version = $"{verBase}{increment}"; - Console.Write(ver); - - ver += Console.ReadLine(); - - Console.WriteLine("Enter code signing password:"); + Console.Write($"Ready to deploy {version}: "); + version += Console.ReadLine(); + Console.Write("Enter code signing password: "); + var fg = Console.ForegroundColor; + Console.ForegroundColor = Console.BackgroundColor; codeSigningPassword = Console.ReadLine(); + Console.ForegroundColor = fg; + Console.WriteLine("Restoring NuGet packages..."); runCommand(nuget_path, "restore " + solutionPath); + Console.WriteLine("Updating AssemblyInfo..."); + updateAssemblyInfo(version); + Console.WriteLine("Running build process..."); runCommand(msbuild_path, $"/v:quiet /m /t:Client\\{ProjectName.Replace('.', '_')} /p:OutputPath={stagingPath};Configuration=Release osu.sln"); Console.WriteLine("Creating NuGet deployment package..."); - runCommand(nuget_path, $"pack osu.Desktop\\osu.nuspec -Version {ver} -Properties Configuration=Deploy -OutputDirectory {stagingPath} -BasePath {stagingPath}"); + runCommand(nuget_path, $"pack osu.Desktop\\osu.nuspec -Version {version} -Properties Configuration=Deploy -OutputDirectory {stagingPath} -BasePath {stagingPath}"); + + Console.WriteLine("Pruning RELEASES..."); + + var releaseLines = new List(); + foreach (var l in File.ReadAllLines(Path.Combine(ReleasesFolder, "RELEASES"))) releaseLines.Add(new ReleaseLine(l)); + + var fulls = releaseLines.Where(l => l.Filename.Contains("-full")).Reverse().Skip(1); + + //remove any FULL releases (except most recent) + foreach (var l in fulls) + { + Console.WriteLine($"- Removing old release {l.Filename}"); + File.Delete(Path.Combine(ReleasesFolder, l.Filename)); + releaseLines.Remove(l); + } + + //remove excess deltas + var deltas = releaseLines.Where(l => l.Filename.Contains("-delta")); + if (deltas.Count() > keep_delta_count) + { + foreach (var l in deltas.Take(deltas.Count() - keep_delta_count)) + { + Console.WriteLine($"- Removing old delta {l.Filename}"); + File.Delete(Path.Combine(ReleasesFolder, l.Filename)); + releaseLines.Remove(l); + } + } + + //ensure we have all files necessary + foreach (var l in releaseLines) + if (!File.Exists(Path.Combine(ReleasesFolder, l.Filename))) + error($"Local file missing {l.Filename}"); + + List lines = new List(); + foreach (var l in releaseLines) + lines.Add(l.ToString()); + File.WriteAllLines(Path.Combine(ReleasesFolder, "RELEASES"), lines); Console.WriteLine("Releasifying package..."); - runCommand(squirrel_path, $"--releasify {stagingPath}\\osulazer.{ver}.nupkg --setupIcon {iconPath} --icon {iconPath} -n \"{codeSigningCmd}\" --no-msi"); + runCommand(squirrel_path, $"--releasify {stagingPath}\\{nupkgFilename(version)} --setupIcon {iconPath} --icon {iconPath} {codeSigningCmd} --no-msi"); //rename setup to install. File.Copy(Path.Combine(ReleasesFolder, "Setup.exe"), Path.Combine(ReleasesFolder, "install.exe"), true); File.Delete(Path.Combine(ReleasesFolder, "Setup.exe")); Console.WriteLine("Done!"); - Console.ReadLine(); } + private static void updateAssemblyInfo(string version) + { + string file = Path.Combine(ProjectName, "Properties", "AssemblyInfo.cs"); + + var l1 = File.ReadAllLines(file); + List l2 = new List(); + foreach (var l in l1) + { + if (l.StartsWith("[assembly: AssemblyVersion(")) + l2.Add($"[assembly: AssemblyVersion(\"{version}\")]"); + else if (l.StartsWith("[assembly: AssemblyFileVersion(")) + l2.Add($"[assembly: AssemblyFileVersion(\"{version}\")]"); + else + l2.Add(l); + } + + File.WriteAllLines(file, l2); + } + /// /// Find the base path of the osu! solution (git checkout location) /// @@ -136,4 +221,21 @@ namespace osu.Desktop.Deploy Environment.Exit(-1); } } + + internal class ReleaseLine + { + public string Hash; + public string Filename; + public int Filesize; + + public ReleaseLine(string line) + { + var split = line.Split(' '); + Hash = split[0]; + Filename = split[1]; + Filesize = int.Parse(split[2]); + } + + public override string ToString() => $"{Hash} {Filename} {Filesize}"; + } } diff --git a/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj b/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj index 19bb226f71..2660473ef8 100644 --- a/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj +++ b/osu.Desktop.Deploy/osu.Desktop.Deploy.csproj @@ -68,6 +68,10 @@ ..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll True + + ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + True + ..\packages\squirrel.windows.1.5.2\lib\Net45\NuGet.Squirrel.dll True @@ -90,6 +94,7 @@ + @@ -97,6 +102,16 @@ + + + {65dc628f-a640-4111-ab35-3a5652bc1e17} + osu.Framework.Desktop + + + {C76BF5B3-985E-4D39-95FE-97C9C879B83A} + osu.Framework + +