Use upstream deploy scripts in CI

This commit is contained in:
peelz
2023-05-26 15:04:39 -04:00
committed by Evil Factory
parent 8890607c53
commit be178715a8
4 changed files with 270 additions and 71 deletions
+43
View File
@@ -0,0 +1,43 @@
diff --git a/Deploy/DeployAll/Program.cs b/Deploy/DeployAll/Program.cs
index 3de060435..6e199b4d4 100644
--- a/Deploy/DeployAll/Program.cs
+++ b/Deploy/DeployAll/Program.cs
@@ -22,37 +22,9 @@ string gitBranch = GitCmd.GetBranch();
Console.WriteLine($"DEPLOYALL - Barotrauma v{gameVersion}, branch {gitBranch}, revision {gitRevision}");
-if (GitCmd.HasUncommittedChanges())
-{
- if (Util.AskQuestion("The repo currently has some uncommitted changes. Do you still wish to proceed? [y/n]")
- .AnsweredNo()) { return; }
-}
-else if (GitCmd.IsRepoOutOfSync())
-{
- if (Util.AskQuestion("The repo is currently out of sync. Do you still wish to proceed? [y/n]")
- .AnsweredNo()) { return; }
-}
-
var sdkVersion = DotnetCmd.GetSdkVersion();
Console.WriteLine($"Using .NET SDK {sdkVersion}");
-string configuration = Util.AskQuestion("Type 1 for Release, 2 for Unstable, enter nothing to cancel") switch
-{
- "1" => "Release",
- "2" => "Unstable",
- _ => ""
-};
-if (string.IsNullOrWhiteSpace(configuration)) { return; }
+const string configuration = "Release";
Deployables.Generate(configuration, gameVersion, gitBranch, gitRevision);
-
-if (Util.AskQuestion("Would you like to upload the generated builds to Steam? [y/n]")
- .AnsweredNo()) { return; }
-
-SteamPipeAssistant.PrepareSteamCmd();
-SteamPipeAssistant.PrepareScripts(configuration, gameVersion, gitBranch, gitRevision);
-
-string userName = Util.AskQuestion("Type your Steam username to upload to Steamworks, enter nothing to skip uploading");
-if (string.IsNullOrWhiteSpace(userName)) { return; }
-
-SteamPipeAssistant.Upload(userName, configuration);
@@ -0,0 +1,113 @@
diff --git a/Deploy/DeployAll/Util.cs b/Deploy/DeployAll/Util.cs
index 6962ac512..d700c7f8e 100644
--- a/Deploy/DeployAll/Util.cs
+++ b/Deploy/DeployAll/Util.cs
@@ -10,97 +10,106 @@ namespace DeployAll;
public static class Util
{
public static void DeleteFiles(string path, params string[] patterns)
{
foreach (var file in patterns.SelectMany(p => Directory.GetFiles(path, p, SearchOption.AllDirectories)))
{
File.Delete(file);
string dir = file;
do
{
dir = Path.GetDirectoryName(dir) ?? "";
if (Directory.GetFiles(dir, "*", SearchOption.AllDirectories).Length == 0)
{
Directory.Delete(dir, recursive: false);
}
else
{
break;
}
} while (dir.LastIndexOf('/') > 0);
}
}
public static void CopyDirectory(string sourceDir, string destinationDir)
{
var dir = new DirectoryInfo(sourceDir);
- DirectoryInfo[] dirs = dir.GetDirectories();
+ DirectoryInfo[] dirs;
+ try
+ {
+ dirs = dir.GetDirectories();
+ }
+ catch (DirectoryNotFoundException ex)
+ {
+ Console.WriteLine($"WARNING: attempted to copy non-existing directory: {ex}");
+ return;
+ }
Directory.CreateDirectory(destinationDir);
foreach (FileInfo file in dir.GetFiles())
{
string targetFilePath = Path.Combine(destinationDir, file.Name);
file.CopyTo(targetFilePath);
}
foreach (DirectoryInfo subDir in dirs)
{
string newDestinationDir = Path.Combine(destinationDir, subDir.Name);
CopyDirectory(subDir.FullName, newDestinationDir);
}
}
public static void DeleteDirectory(string path)
{
if (Directory.Exists(path))
{
Directory.Delete(path, recursive: true);
}
}
public static void RecreateDirectory(string path)
{
DeleteDirectory(path);
Directory.CreateDirectory(path);
}
public static IReadOnlyList<byte> DownloadFile(string url)
{
var httpClient = new HttpClient();
var response = httpClient.Send(new HttpRequestMessage(
HttpMethod.Get,
new Uri(url)));
using var stream = response.Content.ReadAsStream();
using var reader = new BinaryReader(stream);
var contents = new List<byte>();
while (true)
{
byte[] bytesRead = reader.ReadBytes(1024);
if (bytesRead.Length == 0) { break; }
contents.AddRange(bytesRead);
}
return contents;
}
public static string AskQuestion(string question)
{
Console.WriteLine(question);
Console.Write("> ");
string answer = Console.ReadLine() ?? "";
Console.WriteLine("");
return answer;
}
public static bool AnsweredYes(this string answer)
=> answer.Equals("y", StringComparison.InvariantCulture);
public static bool AnsweredNo(this string answer)
=> !answer.AnsweredYes();
public static Process StartProcess(ProcessStartInfo info)
=> Process.Start(info)
?? throw new Exception($"Failed to start process \"{info.FileName}\"");
}
\ No newline at end of file