From 2b44a592f6e56ad3dc354482e23a2ad8db22a669 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sun, 3 Mar 2024 10:20:50 -0500 Subject: [PATCH] Attempt to deduce GitHub and GitLab test merge URLs if API calls fail Closes #1795 --- .../Components/Repository/GitHubRemoteFeatures.cs | 2 +- .../Components/Repository/GitLabRemoteFeatures.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Repository/GitHubRemoteFeatures.cs b/src/Tgstation.Server.Host/Components/Repository/GitHubRemoteFeatures.cs index 7a21ebde2b..6109f490bb 100644 --- a/src/Tgstation.Server.Host/Components/Repository/GitHubRemoteFeatures.cs +++ b/src/Tgstation.Server.Host/Components/Repository/GitHubRemoteFeatures.cs @@ -93,7 +93,7 @@ namespace Tgstation.Server.Host.Components.Repository Comment = parameters.Comment, Number = parameters.Number, TargetCommitSha = revisionToUse, - Url = pr?.HtmlUrl ?? errorMessage, + Url = pr?.HtmlUrl ?? $"https://github.com/{RemoteRepositoryOwner}/{RemoteRepositoryName}/pull/{parameters.Number}", }; return testMerge; diff --git a/src/Tgstation.Server.Host/Components/Repository/GitLabRemoteFeatures.cs b/src/Tgstation.Server.Host/Components/Repository/GitLabRemoteFeatures.cs index 9e468b06e6..9cf32f3f7b 100644 --- a/src/Tgstation.Server.Host/Components/Repository/GitLabRemoteFeatures.cs +++ b/src/Tgstation.Server.Host/Components/Repository/GitLabRemoteFeatures.cs @@ -85,7 +85,7 @@ namespace Tgstation.Server.Host.Components.Repository Comment = parameters.Comment, Number = parameters.Number, TargetCommitSha = parameters.TargetCommitSha, - Url = ex.Message, + Url = $"https://gitlab.com/{RemoteRepositoryOwner}/{RemoteRepositoryName}/-/merge_requests/{parameters.Number}", }; } }