From 835cb333c58fa167eba632af049e5584abcad52a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Apr 2025 10:50:16 +0000 Subject: [PATCH 01/30] Bump System.Threading.Tasks.Extensions from 4.6.2 to 4.6.3 Bumps [System.Threading.Tasks.Extensions](https://github.com/dotnet/maintenance-packages) from 4.6.2 to 4.6.3. - [Release notes](https://github.com/dotnet/maintenance-packages/releases) - [Commits](https://github.com/dotnet/maintenance-packages/commits) --- updated-dependencies: - dependency-name: System.Threading.Tasks.Extensions dependency-version: 4.6.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Tgstation.Server.Common/Tgstation.Server.Common.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj b/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj index 575f74697b..97766617d4 100644 --- a/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj +++ b/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj @@ -12,7 +12,7 @@ - + From 9f698506faa0c85cb6ed9b847edfe1cdecf9eab5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Apr 2025 09:28:07 +0000 Subject: [PATCH 02/30] Bump Microsoft.IdentityModel.JsonWebTokens and Microsoft.Bcl.AsyncInterfaces Bumps [Microsoft.IdentityModel.JsonWebTokens](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet) and [Microsoft.Bcl.AsyncInterfaces](https://github.com/dotnet/runtime). These dependencies needed to be updated together. Updates `Microsoft.IdentityModel.JsonWebTokens` from 8.7.0 to 8.8.0 - [Release notes](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/releases) - [Changelog](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/blob/dev/CHANGELOG.md) - [Commits](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/compare/8.7.0...8.8.0) Updates `Microsoft.Bcl.AsyncInterfaces` from 9.0.3 to 8.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v8.0.0) --- updated-dependencies: - dependency-name: Microsoft.IdentityModel.JsonWebTokens dependency-version: 8.8.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: Microsoft.Bcl.AsyncInterfaces dependency-version: 8.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- src/Tgstation.Server.Api/Tgstation.Server.Api.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj b/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj index 56fc5580cb..d5a111921d 100644 --- a/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj +++ b/src/Tgstation.Server.Api/Tgstation.Server.Api.csproj @@ -28,7 +28,7 @@ - + From 6fd32d992ccc1ca3ad25d3bc85f3250f66cfbf01 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 09:22:56 +0000 Subject: [PATCH 03/30] Bump Microsoft.Extensions.Logging and Microsoft.Bcl.AsyncInterfaces Bumps [Microsoft.Extensions.Logging](https://github.com/dotnet/runtime) and [Microsoft.Bcl.AsyncInterfaces](https://github.com/dotnet/runtime). These dependencies needed to be updated together. Updates `Microsoft.Extensions.Logging` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v9.0.4) Updates `Microsoft.Bcl.AsyncInterfaces` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v9.0.4) --- updated-dependencies: - dependency-name: Microsoft.Extensions.Logging dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.Bcl.AsyncInterfaces dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../Tgstation.Server.Host.Watchdog.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj b/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj index ff887246d9..af47f499f3 100644 --- a/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj +++ b/src/Tgstation.Server.Host.Watchdog/Tgstation.Server.Host.Watchdog.csproj @@ -10,7 +10,7 @@ - + From 4c8c99180c2f0a1f0a1fadae83fd6e01a6c2aa93 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 09:24:11 +0000 Subject: [PATCH 04/30] Bump System.DirectoryServices.AccountManagement from 9.0.3 to 9.0.4 Bumps [System.DirectoryServices.AccountManagement](https://github.com/dotnet/runtime) from 9.0.3 to 9.0.4. - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v9.0.4) --- updated-dependencies: - dependency-name: System.DirectoryServices.AccountManagement dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Tgstation.Server.Host/Tgstation.Server.Host.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index 9968176494..9dd052f2c6 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -160,7 +160,7 @@ - + From b76eab5404f2b4b612afb60b8630afd63535cc09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 09:25:56 +0000 Subject: [PATCH 05/30] Bump Microsoft.Bcl.AsyncInterfaces, Microsoft.EntityFrameworkCore, Microsoft.EntityFrameworkCore.SqlServer and Microsoft.IdentityModel.Protocols.OpenIdConnect Bumps [Microsoft.Bcl.AsyncInterfaces](https://github.com/dotnet/corefx), [Microsoft.EntityFrameworkCore](https://github.com/dotnet/efcore), [Microsoft.EntityFrameworkCore.SqlServer](https://github.com/dotnet/efcore) and [Microsoft.IdentityModel.Protocols.OpenIdConnect](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet). These dependencies needed to be updated together. Updates `Microsoft.Bcl.AsyncInterfaces` from 9.0.3 to 1.1.1 - [Release notes](https://github.com/dotnet/corefx/releases) - [Commits](https://github.com/dotnet/corefx/commits/v1.1.1) Updates `Microsoft.EntityFrameworkCore` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/efcore/releases) - [Commits](https://github.com/dotnet/efcore/compare/v9.0.3...v9.0.4) Updates `Microsoft.EntityFrameworkCore.SqlServer` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/efcore/releases) - [Commits](https://github.com/dotnet/efcore/compare/v9.0.3...v9.0.4) Updates `Microsoft.IdentityModel.Protocols.OpenIdConnect` from 8.7.0 to 6.35.0 - [Release notes](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/releases) - [Changelog](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/blob/dev/CHANGELOG.md) - [Commits](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/compare/8.7.0...6.35.0) --- updated-dependencies: - dependency-name: Microsoft.Bcl.AsyncInterfaces dependency-version: 1.1.1 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.EntityFrameworkCore dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.EntityFrameworkCore.SqlServer dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.IdentityModel.Protocols.OpenIdConnect dependency-version: 6.35.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- src/Tgstation.Server.Host/Tgstation.Server.Host.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index 9968176494..f6cc4107e2 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -118,7 +118,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive @@ -126,7 +126,7 @@ - + From 2e3bc21473a847537653c2027796a6bea25b0987 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 09:27:17 +0000 Subject: [PATCH 06/30] Bump Microsoft.AspNetCore.Mvc.NewtonsoftJson from 8.0.14 to 8.0.15 Bumps [Microsoft.AspNetCore.Mvc.NewtonsoftJson](https://github.com/dotnet/aspnetcore) from 8.0.14 to 8.0.15. - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](https://github.com/dotnet/aspnetcore/compare/v8.0.14...v8.0.15) --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Mvc.NewtonsoftJson dependency-version: 8.0.15 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Tgstation.Server.Host/Tgstation.Server.Host.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index 9968176494..1cd819cb24 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -112,7 +112,7 @@ - + From a4fa8ace1c9bc7642d4751a8af644d2d082617fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 09:28:12 +0000 Subject: [PATCH 07/30] Bump Microsoft.EntityFrameworkCore and Microsoft.EntityFrameworkCore.Sqlite Bumps [Microsoft.EntityFrameworkCore](https://github.com/dotnet/efcore) and [Microsoft.EntityFrameworkCore.Sqlite](https://github.com/dotnet/efcore). These dependencies needed to be updated together. Updates `Microsoft.EntityFrameworkCore` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/efcore/releases) - [Commits](https://github.com/dotnet/efcore/compare/v9.0.3...v9.0.4) Updates `Microsoft.EntityFrameworkCore.Sqlite` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/efcore/releases) - [Commits](https://github.com/dotnet/efcore/compare/v9.0.3...v9.0.4) --- updated-dependencies: - dependency-name: Microsoft.EntityFrameworkCore dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.EntityFrameworkCore.Sqlite dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Tgstation.Server.Host/Tgstation.Server.Host.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index 9968176494..b1fdb0f029 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -118,13 +118,13 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive - + From d1cac8a7d1a5d93989745561ec26b26b3f9f8a6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 09:29:24 +0000 Subject: [PATCH 08/30] Bump Microsoft.Extensions.Logging.Console from 9.0.3 to 9.0.4 Bumps [Microsoft.Extensions.Logging.Console](https://github.com/dotnet/runtime) from 9.0.3 to 9.0.4. - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v9.0.4) --- updated-dependencies: - dependency-name: Microsoft.Extensions.Logging.Console dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../Tgstation.Server.Host.Console.csproj | 2 +- .../Tgstation.Server.Host.Service.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj b/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj index fb8a525a78..5bff41c4f3 100644 --- a/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj +++ b/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj index 65a0469a4e..49165b8ae2 100644 --- a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj +++ b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj @@ -25,7 +25,7 @@ - + From 697e255212dc8cff7e2c3a0b09be753191862a1d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 09:31:31 +0000 Subject: [PATCH 09/30] Bump Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson and Microsoft.Bcl.AsyncInterfaces Bumps [Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson](https://github.com/dotnet/aspnetcore) and [Microsoft.Bcl.AsyncInterfaces](https://github.com/dotnet/runtime). These dependencies needed to be updated together. Updates `Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](https://github.com/dotnet/aspnetcore/compare/v9.0.3...v9.0.4) Updates `Microsoft.Bcl.AsyncInterfaces` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v9.0.4) --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.Bcl.AsyncInterfaces dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Tgstation.Server.Client/Tgstation.Server.Client.csproj | 2 +- src/Tgstation.Server.Host/Tgstation.Server.Host.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj index 384bd5fda3..b7c687757f 100644 --- a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj +++ b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index 9968176494..91d8a74561 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -114,7 +114,7 @@ - + From 4413172ad22b753f2d967e5e48685e9eb46f07b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 09:32:50 +0000 Subject: [PATCH 10/30] Bump System.Management from 9.0.3 to 9.0.4 Bumps [System.Management](https://github.com/dotnet/runtime) from 9.0.3 to 9.0.4. - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v9.0.4) --- updated-dependencies: - dependency-name: System.Management dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Tgstation.Server.Host/Tgstation.Server.Host.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index 9968176494..43a32046ff 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -162,7 +162,7 @@ - + From 29705ea35130f0be7274b23b0ab99360bc64ba2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 09:34:11 +0000 Subject: [PATCH 11/30] Bump Microsoft.AspNetCore.Authentication.OpenIdConnect and Microsoft.IdentityModel.Protocols.OpenIdConnect Bumps [Microsoft.AspNetCore.Authentication.OpenIdConnect](https://github.com/dotnet/aspnetcore) and [Microsoft.IdentityModel.Protocols.OpenIdConnect](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet). These dependencies needed to be updated together. Updates `Microsoft.AspNetCore.Authentication.OpenIdConnect` from 8.0.14 to 8.0.15 - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](https://github.com/dotnet/aspnetcore/compare/v8.0.14...v8.0.15) Updates `Microsoft.IdentityModel.Protocols.OpenIdConnect` from 8.7.0 to 7.1.2 - [Release notes](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/releases) - [Changelog](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/blob/dev/CHANGELOG.md) - [Commits](https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet/compare/8.7.0...7.1.2) --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Authentication.OpenIdConnect dependency-version: 8.0.15 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.IdentityModel.Protocols.OpenIdConnect dependency-version: 7.1.2 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- src/Tgstation.Server.Host/Tgstation.Server.Host.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index 9968176494..e034c9dd62 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -110,7 +110,7 @@ - + From 01eeaf96fdc1b607b9c91f393a2136999a909e09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 09:35:49 +0000 Subject: [PATCH 12/30] Bump Microsoft.Extensions.Logging.EventLog from 9.0.3 to 9.0.4 Bumps [Microsoft.Extensions.Logging.EventLog](https://github.com/dotnet/runtime) from 9.0.3 to 9.0.4. - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v9.0.4) --- updated-dependencies: - dependency-name: Microsoft.Extensions.Logging.EventLog dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../Tgstation.Server.Host.Service.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj index 65a0469a4e..df851195e9 100644 --- a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj +++ b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj @@ -23,7 +23,7 @@ - + From c513afec6a53e7a23cbdc603098a6e62966eb376 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 09:37:00 +0000 Subject: [PATCH 13/30] Bump System.Drawing.Common from 9.0.3 to 9.0.4 Bumps [System.Drawing.Common](https://github.com/dotnet/winforms) from 9.0.3 to 9.0.4. - [Release notes](https://github.com/dotnet/winforms/releases) - [Changelog](https://github.com/dotnet/winforms/blob/main/docs/release-activity.md) - [Commits](https://github.com/dotnet/winforms/compare/v9.0.3...v9.0.4) --- updated-dependencies: - dependency-name: System.Drawing.Common dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../Tgstation.Server.Host.Service.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj index 65a0469a4e..fbb28ab507 100644 --- a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj +++ b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj @@ -29,7 +29,7 @@ - + From 1f99f359d1adad424e2c65d81a10e583e7e73c77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 09:38:19 +0000 Subject: [PATCH 14/30] Bump Microsoft.EntityFrameworkCore and Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore Bumps [Microsoft.EntityFrameworkCore](https://github.com/dotnet/efcore) and [Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore](https://github.com/dotnet/aspnetcore). These dependencies needed to be updated together. Updates `Microsoft.EntityFrameworkCore` from 9.0.3 to 8.0.15 - [Release notes](https://github.com/dotnet/efcore/releases) - [Commits](https://github.com/dotnet/efcore/compare/v9.0.3...v8.0.15) Updates `Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore` from 8.0.14 to 8.0.15 - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](https://github.com/dotnet/aspnetcore/compare/v8.0.14...v8.0.15) --- updated-dependencies: - dependency-name: Microsoft.EntityFrameworkCore dependency-version: 8.0.15 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore dependency-version: 8.0.15 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Tgstation.Server.Host/Tgstation.Server.Host.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index 9968176494..0f2162230e 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -128,7 +128,7 @@ - + From 125d8fa9384be95f67fddd0be643983fae971c81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 09:41:18 +0000 Subject: [PATCH 15/30] Bump Microsoft.Bcl.AsyncInterfaces, Microsoft.EntityFrameworkCore and Microsoft.EntityFrameworkCore.Design Bumps [Microsoft.Bcl.AsyncInterfaces](https://github.com/dotnet/runtime), [Microsoft.EntityFrameworkCore](https://github.com/dotnet/efcore) and [Microsoft.EntityFrameworkCore.Design](https://github.com/dotnet/efcore). These dependencies needed to be updated together. Updates `Microsoft.Bcl.AsyncInterfaces` from 9.0.3 to 7.0.0 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v7.0.0) Updates `Microsoft.EntityFrameworkCore` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/efcore/releases) - [Commits](https://github.com/dotnet/efcore/compare/v9.0.3...v9.0.4) Updates `Microsoft.EntityFrameworkCore.Design` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/efcore/releases) - [Commits](https://github.com/dotnet/efcore/compare/v9.0.3...v9.0.4) --- updated-dependencies: - dependency-name: Microsoft.Bcl.AsyncInterfaces dependency-version: 7.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.EntityFrameworkCore dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.EntityFrameworkCore.Design dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Tgstation.Server.Host/Tgstation.Server.Host.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index 9968176494..c3e44298ab 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -118,9 +118,9 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive From 863c6a554b7a77eaf7cd9c21447ae025a06a7713 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 09:42:00 +0000 Subject: [PATCH 16/30] Bump System.ServiceProcess.ServiceController from 9.0.3 to 9.0.4 Bumps [System.ServiceProcess.ServiceController](https://github.com/dotnet/runtime) from 9.0.3 to 9.0.4. - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v9.0.4) --- updated-dependencies: - dependency-name: System.ServiceProcess.ServiceController dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../Tgstation.Server.Host.Service.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj index 65a0469a4e..b9147b2e80 100644 --- a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj +++ b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj @@ -35,7 +35,7 @@ - + From c459f9a416b203a4a45eedfd8b4a801e6626b3b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 09:42:45 +0000 Subject: [PATCH 17/30] Bump Microsoft.EntityFrameworkCore.InMemory from 9.0.3 to 9.0.4 Bumps [Microsoft.EntityFrameworkCore.InMemory](https://github.com/dotnet/efcore) from 9.0.3 to 9.0.4. - [Release notes](https://github.com/dotnet/efcore/releases) - [Commits](https://github.com/dotnet/efcore/compare/v9.0.3...v9.0.4) --- updated-dependencies: - dependency-name: Microsoft.EntityFrameworkCore.InMemory dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../Tgstation.Server.Host.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Tgstation.Server.Host.Tests/Tgstation.Server.Host.Tests.csproj b/tests/Tgstation.Server.Host.Tests/Tgstation.Server.Host.Tests.csproj index 976f644e52..b6cb2167ad 100644 --- a/tests/Tgstation.Server.Host.Tests/Tgstation.Server.Host.Tests.csproj +++ b/tests/Tgstation.Server.Host.Tests/Tgstation.Server.Host.Tests.csproj @@ -7,7 +7,7 @@ - + From 2dba7cc27b345fc8b0bd39f050b69a7066ba438d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 09:43:54 +0000 Subject: [PATCH 18/30] Bump Microsoft.AspNetCore.SignalR.Client and Microsoft.Bcl.AsyncInterfaces Bumps [Microsoft.AspNetCore.SignalR.Client](https://github.com/dotnet/aspnetcore) and [Microsoft.Bcl.AsyncInterfaces](https://github.com/dotnet/runtime). These dependencies needed to be updated together. Updates `Microsoft.AspNetCore.SignalR.Client` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](https://github.com/dotnet/aspnetcore/compare/v9.0.3...v9.0.4) Updates `Microsoft.Bcl.AsyncInterfaces` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/dotnet/runtime/releases) - [Commits](https://github.com/dotnet/runtime/compare/v9.0.3...v9.0.4) --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.SignalR.Client dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: Microsoft.Bcl.AsyncInterfaces dependency-version: 9.0.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Tgstation.Server.Client/Tgstation.Server.Client.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj index 384bd5fda3..8884af9d25 100644 --- a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj +++ b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj @@ -11,7 +11,7 @@ - + From 8a06738135eef248f3973b2f9aefd34cb474e9db Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Wed, 9 Apr 2025 18:15:18 -0400 Subject: [PATCH 19/30] Bump dotnet-ef version --- src/Tgstation.Server.Host/.config/dotnet-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tgstation.Server.Host/.config/dotnet-tools.json b/src/Tgstation.Server.Host/.config/dotnet-tools.json index bc2098a53b..76e6bce7b3 100644 --- a/src/Tgstation.Server.Host/.config/dotnet-tools.json +++ b/src/Tgstation.Server.Host/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "dotnet-ef": { - "version": "9.0.3", + "version": "9.0.4", "commands": [ "dotnet-ef" ] From 34ae53a056d0fe825db813200fc5344dee9f2996 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Wed, 9 Apr 2025 18:20:56 -0400 Subject: [PATCH 20/30] Update other missed packages --- .../Tgstation.Server.Client.GraphQL.csproj | 2 +- .../Tgstation.Server.Host.Console.csproj | 2 +- .../Tgstation.Server.Host.Service.csproj | 2 +- src/Tgstation.Server.Host/Tgstation.Server.Host.csproj | 2 +- src/Tgstation.Server.Shared/Tgstation.Server.Shared.csproj | 2 +- .../Tgstation.Server.Client.Tests.csproj | 2 +- tests/Tgstation.Server.Tests/Tgstation.Server.Tests.csproj | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Tgstation.Server.Client.GraphQL/Tgstation.Server.Client.GraphQL.csproj b/src/Tgstation.Server.Client.GraphQL/Tgstation.Server.Client.GraphQL.csproj index 57c45ab44a..d5b8544c62 100644 --- a/src/Tgstation.Server.Client.GraphQL/Tgstation.Server.Client.GraphQL.csproj +++ b/src/Tgstation.Server.Client.GraphQL/Tgstation.Server.Client.GraphQL.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj b/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj index 5bff41c4f3..4942cfd2ff 100644 --- a/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj +++ b/src/Tgstation.Server.Host.Console/Tgstation.Server.Host.Console.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj index ea1598a659..6a31f318db 100644 --- a/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj +++ b/src/Tgstation.Server.Host.Service/Tgstation.Server.Host.Service.csproj @@ -21,7 +21,7 @@ - + diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index 3ceb8c89bd..221a67cfcd 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -130,7 +130,7 @@ - + diff --git a/src/Tgstation.Server.Shared/Tgstation.Server.Shared.csproj b/src/Tgstation.Server.Shared/Tgstation.Server.Shared.csproj index be0deff57a..861618a8a9 100644 --- a/src/Tgstation.Server.Shared/Tgstation.Server.Shared.csproj +++ b/src/Tgstation.Server.Shared/Tgstation.Server.Shared.csproj @@ -10,7 +10,7 @@ - + diff --git a/tests/Tgstation.Server.Client.Tests/Tgstation.Server.Client.Tests.csproj b/tests/Tgstation.Server.Client.Tests/Tgstation.Server.Client.Tests.csproj index c36c1a6dcf..725b7c8bcd 100644 --- a/tests/Tgstation.Server.Client.Tests/Tgstation.Server.Client.Tests.csproj +++ b/tests/Tgstation.Server.Client.Tests/Tgstation.Server.Client.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/tests/Tgstation.Server.Tests/Tgstation.Server.Tests.csproj b/tests/Tgstation.Server.Tests/Tgstation.Server.Tests.csproj index 02b4501cd5..8b87acdc61 100644 --- a/tests/Tgstation.Server.Tests/Tgstation.Server.Tests.csproj +++ b/tests/Tgstation.Server.Tests/Tgstation.Server.Tests.csproj @@ -6,7 +6,7 @@ - + From 2d88b7d77845b038d730be00840549e9fc326fce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Apr 2025 09:38:34 +0000 Subject: [PATCH 21/30] Bump the swashbuckle group with 3 updates Bumps the swashbuckle group with 3 updates: [Swashbuckle.AspNetCore](https://github.com/domaindrivendev/Swashbuckle.AspNetCore), [Microsoft.AspNetCore.Mvc.NewtonsoftJson](https://github.com/dotnet/aspnetcore) and [Swashbuckle.AspNetCore.Newtonsoft](https://github.com/domaindrivendev/Swashbuckle.AspNetCore). Updates `Swashbuckle.AspNetCore` from 8.1.0 to 8.1.1 - [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases) - [Commits](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/compare/v8.1.0...v8.1.1) Updates `Microsoft.AspNetCore.Mvc.NewtonsoftJson` from 8.0.15 to 8.0.0 - [Release notes](https://github.com/dotnet/aspnetcore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](https://github.com/dotnet/aspnetcore/compare/v8.0.15...v8.0.0) Updates `Swashbuckle.AspNetCore.Newtonsoft` from 8.1.0 to 8.1.1 - [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases) - [Commits](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/compare/v8.1.0...v8.1.1) --- updated-dependencies: - dependency-name: Swashbuckle.AspNetCore dependency-version: 8.1.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: swashbuckle - dependency-name: Microsoft.AspNetCore.Mvc.NewtonsoftJson dependency-version: 8.0.0 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: swashbuckle - dependency-name: Swashbuckle.AspNetCore.Newtonsoft dependency-version: 8.1.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: swashbuckle ... Signed-off-by: dependabot[bot] --- src/Tgstation.Server.Host/Tgstation.Server.Host.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index 221a67cfcd..8813a159e5 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -156,9 +156,9 @@ - + - + From 92a5cf1f348fb8ca9f71bf6d7e061afac6b0ac8c Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Fri, 11 Apr 2025 21:20:56 -0400 Subject: [PATCH 22/30] Update webpanel version --- build/WebpanelVersion.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/WebpanelVersion.props b/build/WebpanelVersion.props index ba17bc8c08..c1a42663e6 100644 --- a/build/WebpanelVersion.props +++ b/build/WebpanelVersion.props @@ -1,6 +1,6 @@ - 6.9.5 + 6.10.0 From d57023798eaec129c0c6dd43df1458f61c44e323 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sat, 12 Apr 2025 11:29:22 -0400 Subject: [PATCH 23/30] Fix systemd dependencies --- build/package/nix/tgstation-server.nix | 3 ++- build/tgstation-server.service | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/package/nix/tgstation-server.nix b/build/package/nix/tgstation-server.nix index 6079ea037f..3b44da3309 100644 --- a/build/package/nix/tgstation-server.nix +++ b/build/package/nix/tgstation-server.nix @@ -162,8 +162,9 @@ in ]; restartIfChanged = false; # So that the TGS service doesn't just get restarted whenever it's updated, and boots players wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ - "network.target" + "network-online.target" "mysql.service" "mariadb.service" "postgresql.service" diff --git a/build/tgstation-server.service b/build/tgstation-server.service index 44ce74fe2e..02528a8433 100644 --- a/build/tgstation-server.service +++ b/build/tgstation-server.service @@ -1,6 +1,7 @@ [Unit] Description=tgstation-server -After=network.target +Wants=network-online.target +After=network-online.target After=mysql.service After=mariadb.service After=postgresql.service From 6e1ad62f836d2a2132202a4f1a925abc30b2f03e Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sat, 12 Apr 2025 19:31:19 -0400 Subject: [PATCH 24/30] Attempt #1 at fixing nix deployment --- .github/workflows/ci-pipeline.yml | 59 ++---------------------- .github/workflows/nix-deployment.yml | 67 ++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 56 deletions(-) create mode 100644 .github/workflows/nix-deployment.yml diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index 6d26ff98d3..1011e97ac7 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -2330,64 +2330,11 @@ jobs: asset_content_type: application/octet-stream update-nix: - name: Update Nix SHA + name: Nix Deployment needs: changelog-regen - runs-on: ubuntu-latest if: (!(cancelled() || failure())) && needs.changelog-regen.result == 'success' - steps: - - name: Install Native Packages # Name checked in rerunFlakyTests.js - run: | - sudo apt-get update - sudo apt-get install -y xmlstarlet - - - name: Setup Nix - uses: cachix/install-nix-action@v30 - with: - nix_path: nixpkgs=channel:nixos-unstable - - - name: Generate App Token - id: app-token-generation - uses: actions/create-github-app-token@v1 - with: - repositories: tgstation-ppa - app-id: ${{ secrets.APP_ID }} - private-key: ${{ secrets.APP_PRIVATE_KEY }} - - - name: Clone - run: git clone -b master --single-branch "https://tgstation-server-ci:${{ steps.app-token-generation.outputs.token }}@github.com/tgstation/tgstation-server" --depth 1 . - - - name: Parse TGS version - run: echo "TGS_VERSION=$(xmlstarlet sel -N X="http://schemas.microsoft.com/developer/msbuild/2003" --template --value-of /X:Project/X:PropertyGroup/X:TgsCoreVersion build/Version.props)" >> $GITHUB_ENV - - - name: Retrieve ServerConsole.zip Artifact - uses: actions/download-artifact@v4 - with: - name: server-console-release - path: server-console-release - - - name: Regenerate Nix Hash - run: | - nix hash path ./server-console-release > build/package/nix/ServerConsole.sha256 - cat build/package/nix/ServerConsole.sha256 - - - name: Commit - run: | - git config --global push.default simple - git config user.name "tgstation-server-ci[bot]" - git config user.email "161980869+tgstation-server-ci[bot]@users.noreply.github.com" - git add build/package/nix/ServerConsole.sha256 - git commit -m "Update nix SHA256 for TGS v${{ env.TGS_VERSION }}" - - - name: Re-tag - run: | - git tag -d tgstation-server-v${{ env.TGS_VERSION }} - git tag -a tgstation-server-v${{ env.TGS_VERSION }} -m tgstation-server-v${{ env.TGS_VERSION }} - - - name: Push Commit - run: git push "https://tgstation-server-ci:${{ steps.app-token-generation.outputs.token }}@github.com/tgstation/tgstation-server" - - - name: Force Push Tags - run: git push -f origin tag tgstation-server-v${{ env.TGS_VERSION }} + uses: ./.github/workflows/nix-deployment.yml + secrets: inherit changelog-regen: name: Regenerate Changelog diff --git a/.github/workflows/nix-deployment.yml b/.github/workflows/nix-deployment.yml new file mode 100644 index 0000000000..aaf1a2c4d0 --- /dev/null +++ b/.github/workflows/nix-deployment.yml @@ -0,0 +1,67 @@ +name: Nix Deployment + +on: + workflow_call: + workflow_dispatch: + +jobs: + update-nix: + name: Update Nix SHA (master) + runs-on: ubuntu-latest + steps: + - name: Install Native Packages # Name checked in rerunFlakyTests.js + run: | + sudo apt-get update + sudo apt-get install -y xmlstarlet + + - name: Setup Nix + uses: cachix/install-nix-action@v30 + with: + nix_path: nixpkgs=channel:nixos-unstable + + - name: Generate App Token + id: app-token-generation + uses: actions/create-github-app-token@v1 + with: + repositories: tgstation-ppa + app-id: ${{ secrets.APP_ID }} + private-key: ${{ secrets.APP_PRIVATE_KEY }} + + - name: Checkout + uses: actions/checkout@v4 + with: + token: ${{ steps.app-token-generation.outputs.token }} + ref: master + + - name: Parse TGS version + run: echo "TGS_VERSION=$(xmlstarlet sel -N X="http://schemas.microsoft.com/developer/msbuild/2003" --template --value-of /X:Project/X:PropertyGroup/X:TgsCoreVersion build/Version.props)" >> $GITHUB_ENV + + - name: Retrieve ServerConsole.zip Artifact + run: | + curl -L https://github.com/tgstation/tgstation-server/releases/download/tgstation-server-v${{ env.TGS_VERSION }}/ServerConsole.zip -f -o ServerConsole.zip + unzip ServerConsole.zip -d release + + - name: Regenerate Nix Hash + run: | + nix hash path ./release > build/package/nix/ServerConsole.sha256 + cat build/package/nix/ServerConsole.sha256 + rm -rf ./release ServerConsole.zip + + - name: Commit + run: | + git config --global push.default simple + git config user.name "tgstation-server-ci[bot]" + git config user.email "161980869+tgstation-server-ci[bot]@users.noreply.github.com" + git add build/package/nix/ServerConsole.sha256 + git commit -m "Update nix SHA256 for TGS v${{ env.TGS_VERSION }}" + + - name: Re-tag + run: | + git tag -d tgstation-server-v${{ env.TGS_VERSION }} + git tag -a tgstation-server-v${{ env.TGS_VERSION }} -m tgstation-server-v${{ env.TGS_VERSION }} + + - name: Push Commit + run: git push "https://tgstation-server-ci:${{ steps.app-token-generation.outputs.token }}@github.com/tgstation/tgstation-server" + + - name: Force Push Tags + run: git push -f origin tag tgstation-server-v${{ env.TGS_VERSION }} From aa183c053de207b28e9526376cdf33f2ce3aeba4 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sat, 12 Apr 2025 19:35:47 -0400 Subject: [PATCH 25/30] Attempt 2 at fixing nix deployment --- .github/workflows/nix-deployment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/nix-deployment.yml b/.github/workflows/nix-deployment.yml index aaf1a2c4d0..f998f7e9db 100644 --- a/.github/workflows/nix-deployment.yml +++ b/.github/workflows/nix-deployment.yml @@ -32,6 +32,7 @@ jobs: with: token: ${{ steps.app-token-generation.outputs.token }} ref: master + fetch-tags: true - name: Parse TGS version run: echo "TGS_VERSION=$(xmlstarlet sel -N X="http://schemas.microsoft.com/developer/msbuild/2003" --template --value-of /X:Project/X:PropertyGroup/X:TgsCoreVersion build/Version.props)" >> $GITHUB_ENV From e1bab22a4d57ac1c4db4fedc0bbd1c37c1a59787 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sat, 12 Apr 2025 19:44:54 -0400 Subject: [PATCH 26/30] Workaround for https://github.com/actions/checkout/issues/1471 --- .github/workflows/nix-deployment.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nix-deployment.yml b/.github/workflows/nix-deployment.yml index f998f7e9db..f46272cceb 100644 --- a/.github/workflows/nix-deployment.yml +++ b/.github/workflows/nix-deployment.yml @@ -32,7 +32,8 @@ jobs: with: token: ${{ steps.app-token-generation.outputs.token }} ref: master - fetch-tags: true + fetch-depth: 0 + # fetch-tags: true Doesn't work, see https://github.com/actions/checkout/issues/1471 - name: Parse TGS version run: echo "TGS_VERSION=$(xmlstarlet sel -N X="http://schemas.microsoft.com/developer/msbuild/2003" --template --value-of /X:Project/X:PropertyGroup/X:TgsCoreVersion build/Version.props)" >> $GITHUB_ENV From 756446a5e312c9f2f346155af01f00c94051ca58 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sat, 12 Apr 2025 19:50:15 -0400 Subject: [PATCH 27/30] Try without push specifier --- .github/workflows/nix-deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nix-deployment.yml b/.github/workflows/nix-deployment.yml index f46272cceb..29ac1e6b88 100644 --- a/.github/workflows/nix-deployment.yml +++ b/.github/workflows/nix-deployment.yml @@ -63,7 +63,7 @@ jobs: git tag -a tgstation-server-v${{ env.TGS_VERSION }} -m tgstation-server-v${{ env.TGS_VERSION }} - name: Push Commit - run: git push "https://tgstation-server-ci:${{ steps.app-token-generation.outputs.token }}@github.com/tgstation/tgstation-server" + run: git push - name: Force Push Tags run: git push -f origin tag tgstation-server-v${{ env.TGS_VERSION }} From 824ceed467074f643736209cf6d907c9962314cf Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sat, 12 Apr 2025 20:28:44 -0400 Subject: [PATCH 29/30] I'm stupid, I'm so stupid --- .github/workflows/nix-deployment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/nix-deployment.yml b/.github/workflows/nix-deployment.yml index 29ac1e6b88..a61fa13237 100644 --- a/.github/workflows/nix-deployment.yml +++ b/.github/workflows/nix-deployment.yml @@ -23,7 +23,6 @@ jobs: id: app-token-generation uses: actions/create-github-app-token@v1 with: - repositories: tgstation-ppa app-id: ${{ secrets.APP_ID }} private-key: ${{ secrets.APP_PRIVATE_KEY }} From 2041bec88ca82948d9e00e3dc0ca880aad40e8a1 Mon Sep 17 00:00:00 2001 From: "tgstation-server-ci[bot]" <161980869+tgstation-server-ci[bot]@users.noreply.github.com> Date: Sun, 13 Apr 2025 00:31:42 +0000 Subject: [PATCH 30/30] Update nix SHA256 for TGS v6.16.0 --- build/package/nix/ServerConsole.sha256 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/package/nix/ServerConsole.sha256 b/build/package/nix/ServerConsole.sha256 index 985170eb14..e51913ebeb 100644 --- a/build/package/nix/ServerConsole.sha256 +++ b/build/package/nix/ServerConsole.sha256 @@ -1 +1 @@ -sha256-6Wkdb1U2Xmw239zKJTbKcStdAV/G7aMa2oeCsGaSucA= +sha256-LX9Hq1pefHFWlzncaRW+OCmxBQeCxn0g+p3eE3UCeMs=