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

Dependency updates

Browse Source 
Migration for 64-bit GitHub Deployment IDs
This commit is contained in:
Jordan Dominion
2024-07-01 19:49:43 -04:00
parent 0d96155300
commit 40d667f454
22 changed files with 3502 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/TestCommon.props
+4 -4
View File
@@ -8,19 +8,19 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<!-- Usage: Logging specific for GitHub actions -->
<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<!-- Usage: Hard to say what exactly this is for, but not including it removes the test icon and breaks vstest.console.exe for some reason -->
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" Condition="'$(TgsTestNoSdk)' != 'true'" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" Condition="'$(TgsTestNoSdk)' != 'true'" />
<!-- Usage: Dependency mocking for tests -->
<!-- Pinned: Be VERY careful about updating https://github.com/moq/moq/issues/1372 -->
<PackageReference Include="Moq" Version="4.20.70" />
<!-- Usage: MSTest execution -->
<PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
<PackageReference Include="MSTest.TestAdapter" Version="3.4.3" />
<!-- Usage: MSTest asserts etc... -->
<PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.4.3" />
</ItemGroup>
</Project>
build/Version.props
+1 -1
View File
@@ -17,7 +17,7 @@
<TgsNugetNetFramework>netstandard2.0</TgsNugetNetFramework>
<TgsNetMajorVersion>8</TgsNetMajorVersion>
<!-- Update this frequently with dotnet runtime patches. MAJOR MUST MATCH ABOVE! -->
<TgsDotnetRedistUrl>https://download.visualstudio.microsoft.com/download/pr/00397fee-1bd9-44ef-899b-4504b26e6e96/ab9c73409659f3238d33faee304a8b7c/dotnet-hosting-8.0.4-win.exe</TgsDotnetRedistUrl>
<TgsDotnetRedistUrl>https://download.visualstudio.microsoft.com/download/pr/751d3fcd-72db-4da2-b8d0-709c19442225/33cc492bde704bfd6d70a2b9109005a0/dotnet-hosting-8.0.6-win.exe</TgsDotnetRedistUrl>
<TgsMariaDBRedistVersion>10.11.6</TgsMariaDBRedistVersion>
<TgsYarnVersion>1.22.21</TgsYarnVersion>
</PropertyGroup>
src/Tgstation.Server.Api/Tgstation.Server.Api.csproj
+1 -1
View File
@@ -27,7 +27,7 @@
<!-- Usage: HTTP constants reference -->
<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
<!-- Usage: Decoding the 'nbf' property of JWTs -->
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.5.1" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="7.6.2" />
<!-- Usage: Primary JSON library -->
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<!-- Usage: Data model annotating -->
src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
+2 -2
View File
@@ -11,9 +11,9 @@
<ItemGroup>
<!-- Usage: Connecting to SignalR hubs in API -->
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.4" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.6" />
<!-- Usage: Using target JSON serializer for API -->
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.4" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.6" />
</ItemGroup>
<ItemGroup>
src/Tgstation.Server.Host/.config/dotnet-tools.json
+1 -1
View File
@@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "8.0.4",
"version": "8.0.6",
"commands": [
"dotnet-ef"
]
src/Tgstation.Server.Host/Database/DatabaseContext.cs
+13 -3
View File
@@ -375,17 +375,17 @@ namespace Tgstation.Server.Host.Database
/// <summary>
/// Used by unit tests to remind us to setup the correct MSSQL migration downgrades.
/// </summary>
internal static readonly Type MSLatestMigration = typeof(MSAddCompilerAdditionalArguments);
internal static readonly Type MSLatestMigration = typeof(MSSwitchTo64BitDeploymentIds);
/// <summary>
/// Used by unit tests to remind us to setup the correct MYSQL migration downgrades.
/// </summary>
internal static readonly Type MYLatestMigration = typeof(MYAddCompilerAdditionalArguments);
internal static readonly Type MYLatestMigration = typeof(MYSwitchTo64BitDeploymentIds);
/// <summary>
/// Used by unit tests to remind us to setup the correct PostgresSQL migration downgrades.
/// </summary>
internal static readonly Type PGLatestMigration = typeof(PGAddCompilerAdditionalArguments);
internal static readonly Type PGLatestMigration = typeof(PGSwitchTo64BitDeploymentIds);
/// <summary>
/// Used by unit tests to remind us to setup the correct SQLite migration downgrades.
@@ -419,6 +419,16 @@ namespace Tgstation.Server.Host.Database
string BadDatabaseType() => throw new ArgumentException($"Invalid DatabaseType: {currentDatabaseType}", nameof(currentDatabaseType));
if (targetVersion < new Version(6, 6, 0))
targetMigration = currentDatabaseType switch
{
DatabaseType.MySql => nameof(MYAddCompilerAdditionalArguments),
DatabaseType.PostgresSql => nameof(PGAddCompilerAdditionalArguments),
DatabaseType.SqlServer => nameof(MSAddCompilerAdditionalArguments),
DatabaseType.Sqlite => nameof(SLAddCompilerAdditionalArguments),
_ => BadDatabaseType(),
};
if (targetVersion < new Version(6, 5, 0))
targetMigration = currentDatabaseType switch
{
src/Tgstation.Server.Host/Database/Migrations/20240701234445_MSSwitchTo64BitDeploymentIds.Designer.cs
Generated
+1084
View File
File diff suppressed because it is too large Load Diff
src/Tgstation.Server.Host/Database/Migrations/20240701234445_MSSwitchTo64BitDeploymentIds.cs
+40
View File
@@ -0,0 +1,40 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace Tgstation.Server.Host.Database.Migrations
{
/// <inheritdoc />
public partial class MSSwitchTo64BitDeploymentIds : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
ArgumentNullException.ThrowIfNull(migrationBuilder);
migrationBuilder.AlterColumn<long>(
name: "GitHubDeploymentId",
table: "CompileJobs",
type: "bigint",
nullable: true,
oldClrType: typeof(int),
oldType: "int",
oldNullable: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
ArgumentNullException.ThrowIfNull(migrationBuilder);
migrationBuilder.AlterColumn<int>(
name: "GitHubDeploymentId",
table: "CompileJobs",
type: "int",
nullable: true,
oldClrType: typeof(long),
oldType: "bigint",
oldNullable: true);
}
}
}
src/Tgstation.Server.Host/Database/Migrations/20240701234452_MYSwitchTo64BitDeploymentIds.Designer.cs
Generated
+1154
View File
File diff suppressed because it is too large Load Diff
src/Tgstation.Server.Host/Database/Migrations/20240701234452_MYSwitchTo64BitDeploymentIds.cs
+40
View File
@@ -0,0 +1,40 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace Tgstation.Server.Host.Database.Migrations
{
/// <inheritdoc />
public partial class MYSwitchTo64BitDeploymentIds : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
ArgumentNullException.ThrowIfNull(migrationBuilder);
migrationBuilder.AlterColumn<long>(
name: "GitHubDeploymentId",
table: "CompileJobs",
type: "bigint",
nullable: true,
oldClrType: typeof(int),
oldType: "int",
oldNullable: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
ArgumentNullException.ThrowIfNull(migrationBuilder);
migrationBuilder.AlterColumn<int>(
name: "GitHubDeploymentId",
table: "CompileJobs",
type: "int",
nullable: true,
oldClrType: typeof(long),
oldType: "bigint",
oldNullable: true);
}
}
}
src/Tgstation.Server.Host/Database/Migrations/20240701234459_PGSwitchTo64BitDeploymentIds.Designer.cs
Generated
+1078
View File
File diff suppressed because it is too large Load Diff
src/Tgstation.Server.Host/Database/Migrations/20240701234459_PGSwitchTo64BitDeploymentIds.cs
+40
View File
@@ -0,0 +1,40 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace Tgstation.Server.Host.Database.Migrations
{
/// <inheritdoc />
public partial class PGSwitchTo64BitDeploymentIds : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
ArgumentNullException.ThrowIfNull(migrationBuilder);
migrationBuilder.AlterColumn<long>(
name: "GitHubDeploymentId",
table: "CompileJobs",
type: "bigint",
nullable: true,
oldClrType: typeof(int),
oldType: "integer",
oldNullable: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
ArgumentNullException.ThrowIfNull(migrationBuilder);
migrationBuilder.AlterColumn<int>(
name: "GitHubDeploymentId",
table: "CompileJobs",
type: "integer",
nullable: true,
oldClrType: typeof(long),
oldType: "bigint",
oldNullable: true);
}
}
}
src/Tgstation.Server.Host/Database/Migrations/MySqlDatabaseContextModelSnapshot.cs
+3 -3
View File
@@ -13,7 +13,7 @@ namespace Tgstation.Server.Host.Database.Migrations
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "8.0.4")
.HasAnnotation("ProductVersion", "8.0.6")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
@@ -149,8 +149,8 @@ namespace Tgstation.Server.Host.Database.Migrations
MySqlPropertyBuilderExtensions.HasCharSet(b.Property<string>("EngineVersion"), "utf8mb4");
b.Property<int?>("GitHubDeploymentId")
.HasColumnType("int");
b.Property<long?>("GitHubDeploymentId")
.HasColumnType("bigint");
b.Property<long?>("GitHubRepoId")
.HasColumnType("bigint");
src/Tgstation.Server.Host/Database/Migrations/PostgresSqlDatabaseContextModelSnapshot.cs
+3 -3
View File
@@ -13,7 +13,7 @@ namespace Tgstation.Server.Host.Database.Migrations
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "8.0.4")
.HasAnnotation("ProductVersion", "8.0.6")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -137,8 +137,8 @@ namespace Tgstation.Server.Host.Database.Migrations
.IsRequired()
.HasColumnType("text");
b.Property<int?>("GitHubDeploymentId")
.HasColumnType("integer");
b.Property<long?>("GitHubDeploymentId")
.HasColumnType("bigint");
b.Property<long?>("GitHubRepoId")
.HasColumnType("bigint");
src/Tgstation.Server.Host/Database/Migrations/SqlServerDatabaseContextModelSnapshot.cs
+3 -3
View File
@@ -13,7 +13,7 @@ namespace Tgstation.Server.Host.Database.Migrations
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "8.0.4")
.HasAnnotation("ProductVersion", "8.0.6")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
@@ -139,8 +139,8 @@ namespace Tgstation.Server.Host.Database.Migrations
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<int?>("GitHubDeploymentId")
.HasColumnType("int");
b.Property<long?>("GitHubDeploymentId")
.HasColumnType("bigint");
b.Property<long?>("GitHubRepoId")
.HasColumnType("bigint");
src/Tgstation.Server.Host/Models/CompileJob.cs
+1 -1
View File
@@ -60,7 +60,7 @@ namespace Tgstation.Server.Host.Models
/// <summary>
/// The GitHub deployment ID associated with the <see cref="CompileJob"/> if any.
/// </summary>
public int? GitHubDeploymentId { get; set; }
public long? GitHubDeploymentId { get; set; }
/// <inheritdoc />
public override Version? DMApiVersion
src/Tgstation.Server.Host/Tgstation.Server.Host.csproj
+19 -19
View File
@@ -70,57 +70,57 @@
<!-- Usage: IRC interop -->
<PackageReference Include="Cyberboss.SmartIrc4net.Standard" Version="0.4.7" />
<!-- Usage: .env file parsing -->
<PackageReference Include="DotEnv.Core" Version="3.0.0" />
<PackageReference Include="DotEnv.Core" Version="3.1.0" />
<!-- Usage: Text formatter for Elasticsearch logging plugin -->
<PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.11.0" />
<PackageReference Include="Elastic.CommonSchema.Serilog" Version="8.11.1" />
<!-- Usage: GitLab interop -->
<PackageReference Include="GitLabApiClient" Version="1.8.0" />
<!-- Usage: git interop -->
<PackageReference Include="LibGit2Sharp" Version="0.30.0" />
<!-- Usage: JWT injection into HTTP pipeline -->
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.6" />
<!-- Usage: Support ""legacy"" Newotonsoft.Json in HTTP pipeline. The rest of our codebase uses Newtonsoft. -->
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.6" />
<!-- Usage: Using target JSON serializer for API -->
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.4" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.6" />
<!-- Usage: Generating dumps of dotnet engine processes -->
<PackageReference Include="Microsoft.Diagnostics.NETCore.Client" Version="0.2.510501" />
<PackageReference Include="Microsoft.Diagnostics.NETCore.Client" Version="0.2.532401" />
<!-- Usage: Database ORM -->
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<!-- Usage: Automatic migration generation using command line -->
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.4">
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<!-- Usage: Sqlite ORM plugin -->
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.6" />
<!-- Usage: MSSQL ORM plugin -->
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
<!-- Usage: POSIX support for syscalls, signals, and symlinks -->
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
<!-- Usage: YAML config plugin -->
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
<!-- Usage: PostgresSQL ORM plugin -->
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
<!-- Usage: GitHub.com interop -->
<PackageReference Include="Octokit" Version="11.0.1" />
<PackageReference Include="Octokit" Version="13.0.0" />
<!-- Usage: MYSQL/MariaDB ORM plugin -->
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
<!-- Usage: Discord interop -->
<PackageReference Include="Remora.Discord" Version="2024.1.0" />
<PackageReference Include="Remora.Discord" Version="2024.2.0" />
<!-- Usage: Rich logger builder -->
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
<!-- Usage: Async logging plugin -->
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
<!-- Usage: Console logging plugin -->
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<!-- Usage: Elasticsearch logging plugin -->
<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="10.0.0" />
<!-- Usage: File logging plugin -->
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
<!-- Usage: OpenAPI spec generator -->
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
<!-- Usage: Newtonsoft.Json plugin for OpenAPI spec generator -->
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.6.2" />
<!-- Usage: Windows authentication plugin allowing searching for users by name -->
<PackageReference Include="System.DirectoryServices.AccountManagement" Version="8.0.0" />
<!-- Usage: Identifying owning user of Windows Process objects -->
@@ -128,7 +128,7 @@
<!-- Usage: Temporary resolution to compatibility issues with EFCore 7 and .NET 8 -->
<PackageReference Include="System.Security.Permissions" Version="8.0.0" />
<!-- Usage: .DeleteAsync() support for IQueryable<T>s -->
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="8.102.2.2" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="8.103.0" />
</ItemGroup>
<ItemGroup>
src/Tgstation.Server.Host/Utils/GitHub/GitHubService.cs
+4 -4
View File
@@ -133,7 +133,7 @@ namespace Tgstation.Server.Host.Utils.GitHub
}
/// <inheritdoc />
public async ValueTask<int> GetCurrentUserId(CancellationToken cancellationToken)
public async ValueTask<long> GetCurrentUserId(CancellationToken cancellationToken)
{
logger.LogTrace("CreateOAuthAccessToken");
@@ -183,7 +183,7 @@ namespace Tgstation.Server.Host.Utils.GitHub
}
/// <inheritdoc />
public async ValueTask<int> CreateDeployment(NewDeployment newDeployment, string repoOwner, string repoName, CancellationToken cancellationToken)
public async ValueTask<long> CreateDeployment(NewDeployment newDeployment, string repoOwner, string repoName, CancellationToken cancellationToken)
{
ArgumentNullException.ThrowIfNull(newDeployment);
@@ -206,7 +206,7 @@ namespace Tgstation.Server.Host.Utils.GitHub
}
/// <inheritdoc />
public Task CreateDeploymentStatus(NewDeploymentStatus newDeploymentStatus, string repoOwner, string repoName, int deploymentId, CancellationToken cancellationToken)
public Task CreateDeploymentStatus(NewDeploymentStatus newDeploymentStatus, string repoOwner, string repoName, long deploymentId, CancellationToken cancellationToken)
{
ArgumentNullException.ThrowIfNull(newDeploymentStatus);
@@ -228,7 +228,7 @@ namespace Tgstation.Server.Host.Utils.GitHub
}
/// <inheritdoc />
public Task CreateDeploymentStatus(NewDeploymentStatus newDeploymentStatus, long repoId, int deploymentId, CancellationToken cancellationToken)
public Task CreateDeploymentStatus(NewDeploymentStatus newDeploymentStatus, long repoId, long deploymentId, CancellationToken cancellationToken)
{
ArgumentNullException.ThrowIfNull(newDeploymentStatus);
src/Tgstation.Server.Host/Utils/GitHub/IAuthenticatedGitHubService.cs
+3 -3
View File
@@ -29,7 +29,7 @@ namespace Tgstation.Server.Host.Utils.GitHub
/// <param name="repoName">The name of the target repository.</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation.</param>
/// <returns>A <see cref="ValueTask{TResult}"/> resulting in the new deployment's ID.</returns>
ValueTask<int> CreateDeployment(NewDeployment newDeployment, string repoOwner, string repoName, CancellationToken cancellationToken);
ValueTask<long> CreateDeployment(NewDeployment newDeployment, string repoOwner, string repoName, CancellationToken cancellationToken);
/// <summary>
/// Create a <paramref name="newDeploymentStatus"/> on a target deployment.
@@ -40,7 +40,7 @@ namespace Tgstation.Server.Host.Utils.GitHub
/// <param name="deploymentId">The ID of the parent deployment.</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation.</param>
/// <returns>A <see cref="Task"/> representing the running operation.</returns>
Task CreateDeploymentStatus(NewDeploymentStatus newDeploymentStatus, string repoOwner, string repoName, int deploymentId, CancellationToken cancellationToken);
Task CreateDeploymentStatus(NewDeploymentStatus newDeploymentStatus, string repoOwner, string repoName, long deploymentId, CancellationToken cancellationToken);
/// <summary>
/// Create a <paramref name="newDeploymentStatus"/> on a target deployment.
@@ -50,6 +50,6 @@ namespace Tgstation.Server.Host.Utils.GitHub
/// <param name="deploymentId">The ID of the parent deployment.</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation.</param>
/// <returns>A <see cref="Task"/> representing the running operation.</returns>
Task CreateDeploymentStatus(NewDeploymentStatus newDeploymentStatus, long repoId, int deploymentId, CancellationToken cancellationToken);
Task CreateDeploymentStatus(NewDeploymentStatus newDeploymentStatus, long repoId, long deploymentId, CancellationToken cancellationToken);
}
}
src/Tgstation.Server.Host/Utils/GitHub/IGitHubService.cs
+1 -1
View File
@@ -52,7 +52,7 @@ namespace Tgstation.Server.Host.Utils.GitHub
/// </summary>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation.</param>
/// <returns>A <see cref="ValueTask{TResult}"/> resulting in the current user's ID.</returns>
ValueTask<int> GetCurrentUserId(CancellationToken cancellationToken);
ValueTask<long> GetCurrentUserId(CancellationToken cancellationToken);
/// <summary>
/// Get a given <paramref name="pullRequestNumber"/>.
tests/Tgstation.Server.Host.Tests/Tgstation.Server.Host.Tests.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.6" />
</ItemGroup>
<ItemGroup>
tests/Tgstation.Server.Tests/Live/TestingGitHubService.cs
+6 -6
View File
@@ -89,19 +89,19 @@ namespace Tgstation.Server.Tests.Live
return Task.CompletedTask;
}
public ValueTask<int> CreateDeployment(NewDeployment newDeployment, string repoOwner, string repoName, CancellationToken cancellationToken)
public ValueTask<long> CreateDeployment(NewDeployment newDeployment, string repoOwner, string repoName, CancellationToken cancellationToken)
{
logger.LogTrace("CreateDeployment");
return ValueTask.FromResult(new Random().Next()); ;
return ValueTask.FromResult<long>(new Random().Next()); ;
}
public Task CreateDeploymentStatus(NewDeploymentStatus newDeploymentStatus, string repoOwner, string repoName, int deploymentId, CancellationToken cancellationToken)
public Task CreateDeploymentStatus(NewDeploymentStatus newDeploymentStatus, string repoOwner, string repoName, long deploymentId, CancellationToken cancellationToken)
{
logger.LogTrace("CreateDeploymentStatus");
return Task.CompletedTask;
}
public Task CreateDeploymentStatus(NewDeploymentStatus newDeploymentStatus, long repoId, int deploymentId, CancellationToken cancellationToken)
public Task CreateDeploymentStatus(NewDeploymentStatus newDeploymentStatus, long repoId, long deploymentId, CancellationToken cancellationToken)
{
logger.LogTrace("CreateDeploymentStatus");
return Task.CompletedTask;
@@ -113,10 +113,10 @@ namespace Tgstation.Server.Tests.Live
return ValueTask.FromResult(cryptographySuite.GetSecureString());
}
public ValueTask<int> GetCurrentUserId(CancellationToken cancellationToken)
public ValueTask<long> GetCurrentUserId(CancellationToken cancellationToken)
{
logger.LogTrace("GetCurrentUserId");
return ValueTask.FromResult(new Random().Next());
return ValueTask.FromResult<long>(new Random().Next());
}
public ValueTask<long> GetRepositoryId(string repoOwner, string repoName, CancellationToken cancellationToken)