cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-23 21:16:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
tgstation-server
2023-07-01 21:17:22 +00:00
parent a7063fc8e0 6338a2e0f4
commit f7fd9c6418
3 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/Version.props
+1 -1
View File
@@ -3,7 +3,7 @@
<!-- Integration tests will ensure they match across the board -->
<Import Project="ControlPanelVersion.props" />
<PropertyGroup>
<TgsCoreVersion>5.12.6</TgsCoreVersion>
<TgsCoreVersion>5.12.7</TgsCoreVersion>
<TgsConfigVersion>4.6.0</TgsConfigVersion>
<TgsApiVersion>9.10.2</TgsApiVersion>
<TgsCommonLibraryVersion>6.0.0</TgsCommonLibraryVersion>
src/Tgstation.Server.Host/Components/Deployment/Remote/GitHubRemoteDeploymentManager.cs
+20 -13
View File
@@ -127,9 +127,9 @@ namespace Tgstation.Server.Host.Components.Deployment.Remote
Logger.LogTrace("In-progress deployment status created");
}
catch (ApiException ex)
catch (Exception ex) when (ex is not OperationCanceledException)
{
Logger.LogWarning(ex, "Unable to create deployment!");
Logger.LogWarning(ex, "Unable to create GitHub deployment!");
}
}
@@ -138,7 +138,7 @@ namespace Tgstation.Server.Host.Components.Deployment.Remote
compileJob.GitHubRepoId = await repositoryIdTask;
Logger.LogTrace("Set GitHub ID as {gitHubRepoId}", compileJob.GitHubRepoId);
}
catch (RateLimitExceededException ex) when (!repositorySettings.CreateGitHubDeployments.Value)
catch (Exception ex) when (ex is not OperationCanceledException)
{
Logger.LogWarning(ex, "Unable to set compile job repository ID!");
}
@@ -252,9 +252,9 @@ namespace Tgstation.Server.Host.Components.Deployment.Remote
{
await gitHubService.CommentOnIssue(remoteRepositoryOwner, remoteRepositoryName, comment, testMergeNumber, cancellationToken);
}
catch (ApiException e)
catch (Exception ex) when (ex is not OperationCanceledException)
{
Logger.LogWarning(e, "Error posting GitHub comment!");
Logger.LogWarning(ex, "Error posting GitHub comment!");
}
}
@@ -336,14 +336,21 @@ namespace Tgstation.Server.Host.Components.Deployment.Remote
var gitHubService = gitHubServiceFactory.CreateService(gitHubAccessToken);
await gitHubService.CreateDeploymentStatus(
new NewDeploymentStatus(deploymentState)
{
Description = description,
},
compileJob.GitHubRepoId.Value,
compileJob.GitHubDeploymentId.Value,
cancellationToken);
try
{
await gitHubService.CreateDeploymentStatus(
new NewDeploymentStatus(deploymentState)
{
Description = description,
},
compileJob.GitHubRepoId.Value,
compileJob.GitHubDeploymentId.Value,
cancellationToken);
}
catch (Exception ex) when (ex is not OperationCanceledException)
{
Logger.LogWarning(ex, "Error updating GitHub deployment!");
}
}
}
}
src/Tgstation.Server.Host/Components/Deployment/Remote/GitLabRemoteDeploymentManager.cs
+15 -8
View File
@@ -120,7 +120,7 @@ namespace Tgstation.Server.Host.Components.Deployment.Remote
CancellationToken cancellationToken) => Task.CompletedTask;
/// <inheritdoc />
protected override Task CommentOnTestMergeSource(
protected override async Task CommentOnTestMergeSource(
RepositorySettings repositorySettings,
string remoteRepositoryOwner,
string remoteRepositoryName,
@@ -132,13 +132,20 @@ namespace Tgstation.Server.Host.Components.Deployment.Remote
? new GitLabClient(GitLabRemoteFeatures.GitLabUrl, repositorySettings.AccessToken)
: new GitLabClient(GitLabRemoteFeatures.GitLabUrl);
return client
.MergeRequests
.CreateNoteAsync(
$"{remoteRepositoryOwner}/{remoteRepositoryName}",
testMergeNumber,
new CreateMergeRequestNoteRequest(comment))
.WithToken(cancellationToken);
try
{
await client
.MergeRequests
.CreateNoteAsync(
$"{remoteRepositoryOwner}/{remoteRepositoryName}",
testMergeNumber,
new CreateMergeRequestNoteRequest(comment))
.WithToken(cancellationToken);
}
catch (Exception ex) when (ex is not OperationCanceledException)
{
Logger.LogWarning(ex, "Error posting GitHub comment!");
}
}
/// <inheritdoc />