mirror of
https://github.com/Tyrrrz/DiscordChatExporter.git
synced 2026-03-31 09:33:03 -06:00
Revert CliFx removal; fix macOS CI hang by setting WorkingDirectory on Exec
The macOS CI timeout was caused by `dotnet run` detecting the `.csproj` file in the working directory and running the GUI project instead of the `.csx` script. The GUI app would launch, try to initialize Metal/Skia graphics (no display on CI), and hang until the 10-minute job timeout. Fix: Set `WorkingDirectory="$([System.IO.Path]::GetTempPath())"` on the `<Exec>` element so `dotnet run` runs from a clean directory with no project file, correctly treating the `.csx` as a file-based app. Co-authored-by: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com> Agent-Logs-Url: https://github.com/Tyrrrz/DiscordChatExporter/sessions/4e5ffe4c-7b2e-44b9-9477-5ea3d50e0ec0
This commit is contained in:
parent
d8b46b5610
commit
824e1011ca
|
|
@ -56,7 +56,8 @@
|
|||
|
||||
<Target Name="PublishMacOSBundle" AfterTargets="Publish" Condition="$(PublishMacOSBundle)">
|
||||
<Exec
|
||||
Command="dotnet run "$(ProjectDir)/Publish-MacOSBundle.csx" -- --publish-dir "$(PublishDir)" --icons-file "$(ProjectDir)/../favicon.icns" --full-version $(Version) --short-version $(AssemblyVersion)"
|
||||
Command="dotnet run "$(ProjectDir)Publish-MacOSBundle.csx" -- --publish-dir "$(PublishDir)" --icons-file "$(ProjectDir)../favicon.icns" --full-version $(Version) --short-version $(AssemblyVersion)"
|
||||
WorkingDirectory="$([System.IO.Path]::GetTempPath())"
|
||||
LogStandardErrorAsError="true"
|
||||
/>
|
||||
</Target>
|
||||
|
|
|
|||
|
|
@ -1,103 +1,128 @@
|
|||
#!/usr/bin/env -S dotnet run --
|
||||
#:package CliFx
|
||||
|
||||
// Set up arguments
|
||||
string GetArg(string name)
|
||||
using CliFx;
|
||||
using CliFx.Attributes;
|
||||
using CliFx.Infrastructure;
|
||||
|
||||
return await new CliApplicationBuilder()
|
||||
.AddCommand<PublishMacOSBundleCommand>()
|
||||
.Build()
|
||||
.RunAsync(args);
|
||||
|
||||
[Command(Description = "Publishes the GUI app as a macOS .app bundle.")]
|
||||
public class PublishMacOSBundleCommand : ICommand
|
||||
{
|
||||
var idx = Array.IndexOf(args, name);
|
||||
if (idx < 0 || idx + 1 >= args.Length)
|
||||
throw new InvalidOperationException($"Missing required option: {name}");
|
||||
return args[idx + 1];
|
||||
}
|
||||
private const string BundleName = "DiscordChatExporter.app";
|
||||
private const string AppName = "DiscordChatExporter";
|
||||
private const string AppCopyright = "© Oleksii Holub";
|
||||
private const string AppIdentifier = "me.Tyrrrz.DiscordChatExporter";
|
||||
private const string AppSpokenName = "Discord Chat Exporter";
|
||||
private const string AppIconName = "AppIcon";
|
||||
|
||||
var publishDirPathArg = GetArg("--publish-dir");
|
||||
var iconsFilePathArg = GetArg("--icons-file");
|
||||
var fullVersionArg = GetArg("--full-version");
|
||||
var shortVersionArg = GetArg("--short-version");
|
||||
[CommandOption("publish-dir", Description = "Path to the publish output directory.")]
|
||||
public required string PublishDirPath { get; init; }
|
||||
|
||||
const string BundleName = "DiscordChatExporter.app";
|
||||
const string AppName = "DiscordChatExporter";
|
||||
const string AppCopyright = "© Oleksii Holub";
|
||||
const string AppIdentifier = "me.Tyrrrz.DiscordChatExporter";
|
||||
const string AppSpokenName = "Discord Chat Exporter";
|
||||
const string AppIconName = "AppIcon";
|
||||
[CommandOption("icons-file", Description = "Path to the .icns icons file.")]
|
||||
public required string IconsFilePath { get; init; }
|
||||
|
||||
// Set up paths
|
||||
var publishDirPath = Path.GetFullPath(publishDirPathArg);
|
||||
var tempDirPath = Path.GetFullPath(Path.Combine(publishDirPath, "../publish-macos-app-temp"));
|
||||
[CommandOption("full-version", Description = "Full version string (e.g. '1.2.3.4').")]
|
||||
public required string FullVersion { get; init; }
|
||||
|
||||
// Ensure the temporary directory is clean before use in case a previous run crashed
|
||||
if (Directory.Exists(tempDirPath))
|
||||
Directory.Delete(tempDirPath, true);
|
||||
[CommandOption("short-version", Description = "Short version string (e.g. '1.2.3').")]
|
||||
public required string ShortVersion { get; init; }
|
||||
|
||||
var bundleDirPath = Path.Combine(tempDirPath, BundleName);
|
||||
var contentsDirPath = Path.Combine(bundleDirPath, "Contents");
|
||||
|
||||
try
|
||||
{
|
||||
// Copy icons into the .app's Resources folder
|
||||
Directory.CreateDirectory(Path.Combine(contentsDirPath, "Resources"));
|
||||
File.Copy(iconsFilePathArg, Path.Combine(contentsDirPath, "Resources", "AppIcon.icns"), true);
|
||||
|
||||
// Generate the Info.plist metadata file with the app information
|
||||
// lang=xml
|
||||
var plistContent = $"""
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>{AppName}</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>{AppName}</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>{AppName}</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>{AppCopyright}</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>{AppIdentifier}</string>
|
||||
<key>CFBundleSpokenName</key>
|
||||
<string>{AppSpokenName}</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>{AppIconName}</string>
|
||||
<key>CFBundleIconName</key>
|
||||
<string>{AppIconName}</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>{fullVersionArg}</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>{shortVersionArg}</string>
|
||||
<key>NSHighResolutionCapable</key>
|
||||
<true />
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
</dict>
|
||||
</plist>
|
||||
""";
|
||||
|
||||
await File.WriteAllTextAsync(Path.Combine(contentsDirPath, "Info.plist"), plistContent);
|
||||
|
||||
// Delete the previous bundle if it exists
|
||||
var existingBundlePath = Path.Combine(publishDirPath, BundleName);
|
||||
if (Directory.Exists(existingBundlePath))
|
||||
Directory.Delete(existingBundlePath, true);
|
||||
|
||||
// Move all files from the publish directory into the MacOS directory
|
||||
Directory.CreateDirectory(Path.Combine(contentsDirPath, "MacOS"));
|
||||
foreach (var entryPath in Directory.GetFileSystemEntries(publishDirPath))
|
||||
public async ValueTask ExecuteAsync(IConsole console)
|
||||
{
|
||||
var destinationPath = Path.Combine(contentsDirPath, "MacOS", Path.GetFileName(entryPath));
|
||||
// Set up paths
|
||||
var publishDirPath = Path.GetFullPath(PublishDirPath);
|
||||
var tempDirPath = Path.GetFullPath(
|
||||
Path.Combine(publishDirPath, "../publish-macos-app-temp")
|
||||
);
|
||||
|
||||
if (Directory.Exists(entryPath))
|
||||
Directory.Move(entryPath, destinationPath);
|
||||
else
|
||||
File.Move(entryPath, destinationPath);
|
||||
// Ensure the temporary directory is clean before use in case a previous run crashed
|
||||
if (Directory.Exists(tempDirPath))
|
||||
Directory.Delete(tempDirPath, true);
|
||||
|
||||
var bundleDirPath = Path.Combine(tempDirPath, BundleName);
|
||||
var contentsDirPath = Path.Combine(bundleDirPath, "Contents");
|
||||
|
||||
try
|
||||
{
|
||||
// Copy icons into the .app's Resources folder
|
||||
Directory.CreateDirectory(Path.Combine(contentsDirPath, "Resources"));
|
||||
File.Copy(
|
||||
IconsFilePath,
|
||||
Path.Combine(contentsDirPath, "Resources", "AppIcon.icns"),
|
||||
true
|
||||
);
|
||||
|
||||
// Generate the Info.plist metadata file with the app information
|
||||
// lang=xml
|
||||
var plistContent = $"""
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>{AppName}</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>{AppName}</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>{AppName}</string>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>{AppCopyright}</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>{AppIdentifier}</string>
|
||||
<key>CFBundleSpokenName</key>
|
||||
<string>{AppSpokenName}</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>{AppIconName}</string>
|
||||
<key>CFBundleIconName</key>
|
||||
<string>{AppIconName}</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>{FullVersion}</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>{ShortVersion}</string>
|
||||
<key>NSHighResolutionCapable</key>
|
||||
<true />
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
</dict>
|
||||
</plist>
|
||||
""";
|
||||
|
||||
await File.WriteAllTextAsync(Path.Combine(contentsDirPath, "Info.plist"), plistContent);
|
||||
|
||||
// Delete the previous bundle if it exists
|
||||
var existingBundlePath = Path.Combine(publishDirPath, BundleName);
|
||||
if (Directory.Exists(existingBundlePath))
|
||||
Directory.Delete(existingBundlePath, true);
|
||||
|
||||
// Move all files from the publish directory into the MacOS directory
|
||||
Directory.CreateDirectory(Path.Combine(contentsDirPath, "MacOS"));
|
||||
foreach (var entryPath in Directory.GetFileSystemEntries(publishDirPath))
|
||||
{
|
||||
var destinationPath = Path.Combine(
|
||||
contentsDirPath,
|
||||
"MacOS",
|
||||
Path.GetFileName(entryPath)
|
||||
);
|
||||
|
||||
if (Directory.Exists(entryPath))
|
||||
Directory.Move(entryPath, destinationPath);
|
||||
else
|
||||
File.Move(entryPath, destinationPath);
|
||||
}
|
||||
|
||||
// Move the final bundle into the publish directory for upload
|
||||
Directory.Move(bundleDirPath, Path.Combine(publishDirPath, BundleName));
|
||||
}
|
||||
finally
|
||||
{
|
||||
// Clean up the temporary directory
|
||||
if (Directory.Exists(tempDirPath))
|
||||
Directory.Delete(tempDirPath, true);
|
||||
}
|
||||
}
|
||||
|
||||
// Move the final bundle into the publish directory for upload
|
||||
Directory.Move(bundleDirPath, Path.Combine(publishDirPath, BundleName));
|
||||
}
|
||||
finally
|
||||
{
|
||||
// Clean up the temporary directory
|
||||
if (Directory.Exists(tempDirPath))
|
||||
Directory.Delete(tempDirPath, true);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue