From 84c4fc72988247e19144d3b8627d08b590582536 Mon Sep 17 00:00:00 2001 From: Rory& Date: Fri, 10 Apr 2026 00:45:32 +0200 Subject: [PATCH] Clean up update script --- .../admin-api/Spacebar.Cdn.Worker/outputs.nix | 3 - extra/admin-api/update-deps.cs | 89 +++++++++++-------- 2 files changed, 53 insertions(+), 39 deletions(-) diff --git a/extra/admin-api/Spacebar.Cdn.Worker/outputs.nix b/extra/admin-api/Spacebar.Cdn.Worker/outputs.nix index 48f897377..2a10676b4 100644 --- a/extra/admin-api/Spacebar.Cdn.Worker/outputs.nix +++ b/extra/admin-api/Spacebar.Cdn.Worker/outputs.nix @@ -44,9 +44,6 @@ flake-utils.lib.eachSystem flake-utils.lib.allSystems ( projectReferences = [ proj.Spacebar-Interop-Cdn-Abstractions ]; - } - // { - __extraProjectPrefix = "Spacebar.Cdn.Worker"; }; in { diff --git a/extra/admin-api/update-deps.cs b/extra/admin-api/update-deps.cs index 592bbf11f..9fe5f9cda 100755 --- a/extra/admin-api/update-deps.cs +++ b/extra/admin-api/update-deps.cs @@ -10,24 +10,24 @@ using System.Text.Json; // sync versions for CDN worker { Console.WriteLine("==> Ensuring CDN worker dependencies are in sync..."); - var origContent = await File.ReadAllTextAsync("Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16-HDRI.x86_64.csproj"); - var depToReplace = "Magick.NET-Q16-HDRI-OpenMP-x64"; + var origContent = await File.ReadAllTextAsync("Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16-HDRI.x86_64.csproj"); + var depToReplace = "Magick.NET-Q16-HDRI-OpenMP-x64"; (string Project, string Dependency)[] replaceTargets = [ // ("Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16-HDRI.x86_64.csproj", "Magick.NET-Q16-HDRI-OpenMP-x64"), // source ("Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16.x86_64.csproj", "Magick.NET-Q16-OpenMP-x64"), ("Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q8.x86_64.csproj", "Magick.NET-Q8-OpenMP-x64"), - ("Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16-HDRI.aarch64.csproj", "Magick.NET-Q16-HDRI-OpenMP-arm64"), + ("Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16-HDRI.aarch64.csproj", "Magick.NET-Q16-HDRI-OpenMP-arm64"), ("Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16.aarch64.csproj", "Magick.NET-Q16-OpenMP-arm64"), ("Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q8.aarch64.csproj", "Magick.NET-Q8-OpenMP-arm64"), - ("Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16-HDRI.AnyCPU.csproj", "Magick.NET-Q16-HDRI-AnyCPU"), + ("Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16-HDRI.AnyCPU.csproj", "Magick.NET-Q16-HDRI-AnyCPU"), ("Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q16.AnyCPU.csproj", "Magick.NET-Q16-AnyCPU"), ("Spacebar.Cdn.Worker/Spacebar.Cdn.Worker.Q8.AnyCPU.csproj", "Magick.NET-Q8-AnyCPU"), - ]; + ]; - foreach (var target in replaceTargets) { - Console.WriteLine($" ==> {target.Project} -> {target.Dependency}"); - await File.WriteAllTextAsync(target.Project, origContent.Replace(depToReplace, target.Dependency)); - } + foreach (var target in replaceTargets) { + Console.WriteLine($" ==> {target.Project} -> {target.Dependency}"); + await File.WriteAllTextAsync(target.Project, origContent.Replace(depToReplace, target.Dependency)); + } } Console.WriteLine("==> Getting outputs..."); @@ -42,35 +42,52 @@ Console.WriteLine($"==> Updating dependencies for {outs.Length} projects..."); var ss = new SemaphoreSlim(1, 1); var idx = 0; var tasks = outs.Select(outp => Task.Run(async () => { - Console.WriteLine(ConsoleUtils.ColoredString($" ==> Updating {outp}...", 0x80, 0x80, 0xff)); - Console.Write(ConsoleUtils.ColoredString($" ==> Getting project root directory... ", 0x80, 0xff, 0xff)); - var rootDir = JsonSerializer.Deserialize(Util.GetCommandOutputSync("nix", $"eval --json .#packages.x86_64-linux.{outp}.srcRoot", silent: true, stderr: false)).Split("/extra/admin-api/", 2)[1]; - Console.WriteLine(ConsoleUtils.ColoredString($"{rootDir}", 0x80, 0xff, 0xff)); - if (rootDir.Length <= 1) throw new Exception("Invalid project file count?"); + await ss.WaitAsync(); + try { + Console.WriteLine(ConsoleUtils.ColoredString($" ==> Updating {outp}...", 0x80, 0x80, 0xff)); + Console.Write(ConsoleUtils.ColoredString($" ==> Getting project root directory... ", 0x80, 0xff, 0xff)); + var rootDir = JsonSerializer.Deserialize(Util.GetCommandOutputSync("nix", $"eval --json .#packages.x86_64-linux.{outp}.srcRoot", silent: true, stderr: false)) + .Split("/extra/admin-api/", 2)[1]; + var depsFileStorePath = JsonSerializer.Deserialize(Util.GetCommandOutputSync("nix", $"eval --json .#packages.x86_64-linux.{outp}.__nugetDeps", silent: true, stderr: false)); + var depsFileName = new FileInfo(depsFileStorePath).Name; + Console.Write(ConsoleUtils.ColoredString($"{rootDir}", 0x80, 0xff, 0xff)); + Console.Write(" - "); + Console.Write(ConsoleUtils.ColoredString($"{depsFileStorePath} ", 0x80, 0x80, 0xff)); + Console.WriteLine(ConsoleUtils.ColoredString($"({depsFileName})", 0x80, 0xff, 0x80)); - var nugetDepsFilePath = Path.Combine(rootDir, "deps.json"); - Console.WriteLine(ConsoleUtils.ColoredString($" ==> {nugetDepsFilePath} exists: {File.Exists(nugetDepsFilePath)}", 0x80, 0xff, 0xff)); - if (!File.Exists(nugetDepsFilePath)) { - Console.WriteLine(ConsoleUtils.ColoredString($" ==> No NuGet deps file, skipping!", 0xff, 0x80, 0x80)); - return; + if (rootDir.Length <= 1) throw new Exception("Invalid project file count?"); + + var nugetDepsFilePath = Path.Combine(rootDir, depsFileName); + Console.WriteLine(ConsoleUtils.ColoredString($" ==> {nugetDepsFilePath} exists: {File.Exists(nugetDepsFilePath)}", 0x80, 0xff, 0xff)); + if (!File.Exists(nugetDepsFilePath)) { + Console.WriteLine(ConsoleUtils.ColoredString($" ==> No NuGet deps file, skipping!", 0xff, 0x80, 0x80)); + return; + } + + if (idx == 1) await Task.Delay(3000); // give the first one a bit of time to eval... + await Task.Delay(idx++ * 1500); + + var fname = $"./update-deps-{outp}"; + Console.WriteLine(ConsoleUtils.ColoredString($" ==> Building fetch-deps script {fname}...", 0x80, 0xff, 0x80)); + RunCommandSync("nix", $"build .#{outp}.passthru.fetch-deps --out-link {fname}"); + + Console.WriteLine(ConsoleUtils.ColoredString($" ==> Running fetch-deps script, writing into {nugetDepsFilePath}...", 0x80, 0xff, 0x80)); + RunCommandSync(fname, nugetDepsFilePath); + + var deps = JsonSerializer.Deserialize(await File.ReadAllTextAsync(nugetDepsFilePath)); + Console.WriteLine(ConsoleUtils.ColoredString($" ==> Locked {deps.Length} dependencies for {outp}...", (byte)(deps.Length == 0 ? 0xff : 0x80), + (byte)(deps.Length == 0 ? 0x80 : 0xff), 0x80)); + // File.Delete(fname); + // await Task.Delay(250); + } + finally { + ss.Release(); } - - if (idx == 1) await Task.Delay(3000); // give the first one a bit of time to eval... - await Task.Delay(idx++ * 1500); - - var fname = $"./update-deps-{outp}"; - Console.WriteLine(ConsoleUtils.ColoredString($" ==> Building fetch-deps script {fname}...", 0x80, 0xff, 0x80)); - Util.RunCommandSync("nix", $"build .#{outp}.passthru.fetch-deps --out-link {fname}"); - - Console.WriteLine(ConsoleUtils.ColoredString($" ==> Running fetch-deps script, writing into {nugetDepsFilePath}...", 0x80, 0xff, 0x80)); - Util.RunCommandSync(fname, nugetDepsFilePath); - - var deps = JsonSerializer.Deserialize(await File.ReadAllTextAsync(nugetDepsFilePath)); - Console.WriteLine(ConsoleUtils.ColoredString($" ==> Locked {deps.Length} dependencies for {outp}...", (byte)(deps.Length == 0 ? 0xff : 0x80), (byte)(deps.Length == 0 ? 0x80 : 0xff), 0x80)); - File.Delete(fname); - - - // await Task.Delay(250); })).ToList(); await Task.WhenAll(tasks); + +static void RunCommandSync(string command, string args = "", bool silent = false) { + Console.WriteLine($"Executing command (silent: {silent}): {command} {args}"); + Util.RunCommandSync(command, args,silent); +} \ No newline at end of file