Skip to content

Conversation

@smoogipoo
Copy link
Contributor

Was a 30 minute change.

Tested with:

diff --git a/Builders/MacOSBuilder.cs b/Builders/MacOSBuilder.cs
index 543da81..0814103 100644
--- a/Builders/MacOSBuilder.cs
+++ b/Builders/MacOSBuilder.cs
@@ -37,22 +37,7 @@ namespace osu.Desktop.Deploy.Builders
         protected override string TargetFramework => "net8.0";
         protected override string RuntimeIdentifier { get; }
 
-        public override Uploader CreateUploader()
-        {
-            string extraArgs = $" --signEntitlements=\"{Path.Combine(Environment.CurrentDirectory, "osu.entitlements")}\""
-                               + $" --noInst";
-
-            if (!string.IsNullOrEmpty(Program.AppleCodeSignCertName))
-                extraArgs += $" --signAppIdentity=\"{Program.AppleCodeSignCertName}\"";
-            if (!string.IsNullOrEmpty(Program.AppleInstallSignCertName))
-                extraArgs += $" --signInstallIdentity=\"{Program.AppleInstallSignCertName}\"";
-            if (!string.IsNullOrEmpty(Program.AppleNotaryProfileName))
-                extraArgs += $" --notaryProfile=\"{Program.AppleNotaryProfileName}\"";
-            if (!string.IsNullOrEmpty(Program.AppleKeyChainPath))
-                extraArgs += $" --keychain=\"{Path.GetFullPath(Program.AppleKeyChainPath)}\"";
-
-            return new MacOSVelopackUploader(app_name, os_name, RuntimeIdentifier, RuntimeIdentifier, extraArgs: extraArgs, stagingPath: stagingTarget);
-        }
+        public override Uploader CreateUploader() => new GitHubUploader();
 
         public override void Build()
         {

Run 1 (PR):

22527   Running touch "/Users/smgi/Repos/osu-deploy/staging/osu!.app" /Users/smgi/Repos/osu-deploy/staging...
22563   Creating release...
[network] 2025-07-22 10:26:05 [verbose]: Request to https://api.github.com/repos/smoogipoo/osu/releases successfully completed!
23035   - Creating release 2025.722.0-lazer...
[network] 2025-07-22 10:26:05 [verbose]: Request to https://api.github.com/repos/smoogipoo/osu/releases successfully completed!
23524   - Uploading asset osulazer-2025.722.0-lazer-osx-arm64-delta.nupkg...
[network] 2025-07-22 10:26:08 [verbose]: Request to https://uploads.github.com/repos/smoogipoo/osu/releases/234195004/assets?name=osulazer-2025.722.0-lazer-osx-arm64-delta.nupkg successfully completed!
25793   - Uploading asset osulazer-2025.722.0-lazer-osx-arm64-full.nupkg...
[network] 2025-07-22 10:26:20 [verbose]: Request to https://uploads.github.com/repos/smoogipoo/osu/releases/234195004/assets?name=osulazer-2025.722.0-lazer-osx-arm64-full.nupkg successfully completed!
37848   - Uploading asset osulazer-osx-arm64-Portable.zip...
[network] 2025-07-22 10:26:32 [verbose]: Request to https://uploads.github.com/repos/smoogipoo/osu/releases/234195004/assets?name=osulazer-osx-arm64-Portable.zip successfully completed!
50475   - Uploading asset RELEASES-osx-arm64...
[network] 2025-07-22 10:26:33 [verbose]: Request to https://uploads.github.com/repos/smoogipoo/osu/releases/234195004/assets?name=RELEASES-osx-arm64 successfully completed!
51103   - Uploading asset osulazer-2025.613.0-osx-arm64-full.nupkg...
[network] 2025-07-22 10:26:46 [verbose]: Request to https://uploads.github.com/repos/smoogipoo/osu/releases/234195004/assets?name=osulazer-2025.613.0-osx-arm64-full.nupkg successfully completed!
64301   - Uploading asset releases.osx-arm64.json...
[network] 2025-07-22 10:26:47 [verbose]: Request to https://uploads.github.com/repos/smoogipoo/osu/releases/234195004/assets?name=releases.osx-arm64.json successfully completed!
64913   - Uploading asset assets.osx-arm64.json...
[network] 2025-07-22 10:26:47 [verbose]: Request to https://uploads.github.com/repos/smoogipoo/osu/releases/234195004/assets?name=assets.osx-arm64.json successfully completed!
65594   Done!

Run 2 (master):

2954    Running touch "/Users/smgi/Repos/osu-deploy/staging/osu!.app" /Users/smgi/Repos/osu-deploy/staging...
2975    Creating release...
[network] 2025-07-22 10:28:34 [verbose]: Request to https://api.github.com/repos/smoogipoo/osu/releases successfully completed!
3483    - Adding to existing release 2025.722.0-lazer...
3484    - Adding asset releases/osulazer-2025.722.0-lazer-osx-arm64-delta.nupkg...
[network] 2025-07-22 10:28:35 [verbose]: Request to https://uploads.github.com/repos/smoogipoo/osu/releases/234195004/assets?name=osulazer-2025.722.0-lazer-osx-arm64-delta.nupkg failed with System.Net.WebException: UnprocessableEntity.
[network] 2025-07-22 10:28:35 [verbose]: Response was: {"message":"Validation Failed","request_id":"EE95:DB419:75E0E:EB5DD:687F67D2","documentation_url":"https://docs.github.com/rest","errors":[{"resource":"ReleaseAsset","code":"already_exists","field":"name"}]}
Unhandled exception. System.Net.WebException: UnprocessableEntity
   at osu.Framework.IO.Network.WebRequest.Complete(Exception e)
   at osu.Framework.IO.Network.WebRequest.beginResponse(CancellationToken cancellationToken)
   at osu.Framework.IO.Network.WebRequest.internalPerform(CancellationToken cancellationToken)
   at osu.Framework.IO.Network.WebRequest.internalPerform(CancellationToken cancellationToken)
   at osu.Framework.IO.Network.WebRequest.PerformAsync(CancellationToken cancellationToken)
   at osu.Framework.Extensions.ExceptionExtensions.ExceptionExtensions.Rethrow(Exception exception)
   at osu.Framework.Extensions.ExceptionExtensions.ExceptionExtensions.RethrowAsSingular(AggregateException aggregateException)
   at osu.Framework.IO.Network.WebRequest.Perform()
   at osu.Desktop.Deploy.Program.AuthenticatedBlockingPerform(WebRequest r) in /Users/smgi/Repos/osu-deploy/Program.cs:line 295
   at osu.Desktop.Deploy.Uploaders.GitHubUploader.PublishBuild(String version) in /Users/smgi/Repos/osu-deploy/Uploaders/GitHubUploader.cs:line 67
   at osu.Desktop.Deploy.Program.Main(String[] args) in /Users/smgi/Repos/osu-deploy/Program.cs:line 154

Run 3 (PR):

3227    Running touch "/Users/smgi/Repos/osu-deploy/staging/osu!.app" /Users/smgi/Repos/osu-deploy/staging...
3258    Creating release...
[network] 2025-07-22 10:27:20 [verbose]: Request to https://api.github.com/repos/smoogipoo/osu/releases successfully completed!
3668    - Adding to existing release 2025.722.0-lazer...
3670    - Deleting existing asset osulazer-2025.722.0-lazer-osx-arm64-delta.nupkg...
[network] 2025-07-22 10:27:21 [verbose]: Request to https://api.github.com/repos/smoogipoo/osu/releases/assets/275215768 successfully completed!
4044    - Uploading asset osulazer-2025.722.0-lazer-osx-arm64-delta.nupkg...
[network] 2025-07-22 10:27:23 [verbose]: Request to https://uploads.github.com/repos/smoogipoo/osu/releases/234195004/assets?name=osulazer-2025.722.0-lazer-osx-arm64-delta.nupkg successfully completed!
6728    - Deleting existing asset osulazer-2025.722.0-lazer-osx-arm64-full.nupkg...
[network] 2025-07-22 10:27:24 [verbose]: Request to https://api.github.com/repos/smoogipoo/osu/releases/assets/275215773 successfully completed!
7236    - Uploading asset osulazer-2025.722.0-lazer-osx-arm64-full.nupkg...
[network] 2025-07-22 10:27:35 [verbose]: Request to https://uploads.github.com/repos/smoogipoo/osu/releases/234195004/assets?name=osulazer-2025.722.0-lazer-osx-arm64-full.nupkg successfully completed!
18810   - Deleting existing asset osulazer-osx-arm64-Portable.zip...
[network] 2025-07-22 10:27:36 [verbose]: Request to https://api.github.com/repos/smoogipoo/osu/releases/assets/275215807 successfully completed!
19320   - Uploading asset osulazer-osx-arm64-Portable.zip...
[network] 2025-07-22 10:27:49 [verbose]: Request to https://uploads.github.com/repos/smoogipoo/osu/releases/234195004/assets?name=osulazer-osx-arm64-Portable.zip successfully completed!
32945   - Deleting existing asset RELEASES-osx-arm64...
[network] 2025-07-22 10:27:50 [verbose]: Request to https://api.github.com/repos/smoogipoo/osu/releases/assets/275215844 successfully completed!
33451   - Uploading asset RELEASES-osx-arm64...
[network] 2025-07-22 10:27:51 [verbose]: Request to https://uploads.github.com/repos/smoogipoo/osu/releases/234195004/assets?name=RELEASES-osx-arm64 successfully completed!
34068   - Deleting existing asset osulazer-2025.613.0-osx-arm64-full.nupkg...
[network] 2025-07-22 10:27:51 [verbose]: Request to https://api.github.com/repos/smoogipoo/osu/releases/assets/275215847 successfully completed!
34475   - Uploading asset osulazer-2025.613.0-osx-arm64-full.nupkg...
[network] 2025-07-22 10:28:04 [verbose]: Request to https://uploads.github.com/repos/smoogipoo/osu/releases/234195004/assets?name=osulazer-2025.613.0-osx-arm64-full.nupkg successfully completed!
47175   - Deleting existing asset releases.osx-arm64.json...
[network] 2025-07-22 10:28:04 [verbose]: Request to https://api.github.com/repos/smoogipoo/osu/releases/assets/275215918 successfully completed!
47581   - Uploading asset releases.osx-arm64.json...
[network] 2025-07-22 10:28:05 [verbose]: Request to https://uploads.github.com/repos/smoogipoo/osu/releases/234195004/assets?name=releases.osx-arm64.json successfully completed!
48202   - Deleting existing asset assets.osx-arm64.json...
[network] 2025-07-22 10:28:05 [verbose]: Request to https://api.github.com/repos/smoogipoo/osu/releases/assets/275215919 successfully completed!
48610   - Uploading asset assets.osx-arm64.json...
[network] 2025-07-22 10:28:06 [verbose]: Request to https://uploads.github.com/repos/smoogipoo/osu/releases/234195004/assets?name=assets.osx-arm64.json successfully completed!
49319   Done!

@peppy peppy self-requested a review August 7, 2025 05:09
@peppy peppy merged commit ce6e5b4 into ppy:master Aug 7, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants