diff --git a/Server.Installer/Program.cs b/Server.Installer/Program.cs index d8041df4..ee3b7afe 100644 --- a/Server.Installer/Program.cs +++ b/Server.Installer/Program.cs @@ -124,7 +124,9 @@ namespace Server.Installer } ConsoleHelper.WriteLine($"Performing server install. GitHub User: {cliParams.GitHubUsername}. " + - $"Server URL: {cliParams.ServerUrl}. Installation Directory: {cliParams.InstallDirectory}"); + $"Server URL: {cliParams.ServerUrl}. Installation Directory: {cliParams.InstallDirectory}. " + + $"Web Server: {cliParams.WebServer}. Create New Build: {cliParams.CreateNew}. " + + $"Git Reference: {cliParams.Reference}"); var serverInstaller = Services.GetRequiredService(); await serverInstaller.PerformInstall(cliParams); diff --git a/Server.Installer/Services/ServerInstaller.cs b/Server.Installer/Services/ServerInstaller.cs index c569fc7b..501dfc6b 100644 --- a/Server.Installer/Services/ServerInstaller.cs +++ b/Server.Installer/Services/ServerInstaller.cs @@ -30,7 +30,7 @@ namespace Server.Installer.Services public async Task PerformInstall(CliParams cliParams) { var latestBuild = await _githubApi.GetLatestBuildArtifact(cliParams); - var existingBuildTimestamp = latestBuild?.created_at; + var latestBuildId = latestBuild?.id; if (cliParams.CreateNew == true) { @@ -46,8 +46,7 @@ namespace Server.Installer.Services ConsoleHelper.WriteLine("Build action triggered successfully. Waiting for build completion."); - while (latestBuild is null || - latestBuild.created_at <= existingBuildTimestamp.Value) + while (latestBuild?.id == latestBuildId) { await Task.Delay(TimeSpan.FromMinutes(1)); ConsoleHelper.WriteLine("Waiting for GitHub build completion.");