From 5782afbe8465f66e6280fee2a918c2ee4f3e7ebb Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Tue, 4 Oct 2022 20:34:02 -0400
Subject: [PATCH 1/2] Fix a bunch of places the wrong cancellation token was
 used in repo update job

---
 .../Controllers/RepositoryController.cs             | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs
index 38d093fcc8..efd7df793f 100644
--- a/src/Tgstation.Server.Host/Controllers/RepositoryController.cs
+++ b/src/Tgstation.Server.Host/Controllers/RepositoryController.cs
@@ -551,7 +551,7 @@ namespace Tgstation.Server.Host.Controllers
 							}
 
 							if (needsUpdate)
-								await databaseContext.Save(cancellationToken);
+								await databaseContext.Save(ct);
 						});
 
 				await CallLoadRevInfo();
@@ -573,7 +573,7 @@ namespace Tgstation.Server.Host.Controllers
 							var fastForward = await repo.MergeOrigin(committerName, currentModel.CommitterEmail, NextProgressReporter("Merge Origin"), ct);
 							if (!fastForward.HasValue)
 								throw new JobException(ErrorCode.RepoMergeConflict);
-							lastRevisionInfo.OriginCommitSha = await repo.GetOriginSha(cancellationToken);
+							lastRevisionInfo.OriginCommitSha = await repo.GetOriginSha(ct);
 							await UpdateRevInfo();
 							if (fastForward.Value)
 							{
@@ -608,7 +608,7 @@ namespace Tgstation.Server.Host.Controllers
 						if (validCheckoutSha || validCheckoutReference)
 						{
 							var committish = model.CheckoutSha ?? model.Reference;
-							var isSha = await repo.IsSha(committish, cancellationToken);
+							var isSha = await repo.IsSha(committish, ct);
 
 							if ((isSha && model.Reference != null) || (!isSha && model.CheckoutSha != null))
 								throw new JobException(ErrorCode.RepoSwappedShaOrReference);
@@ -713,7 +713,7 @@ namespace Tgstation.Server.Host.Controllers
 											&& x.ActiveTestMerges.Count > 0)
 											.Include(x => x.ActiveTestMerges)
 											.ThenInclude(x => x.TestMerge)
-											.ToListAsync(cancellationToken));
+											.ToListAsync(ct));
 
 								// split here cause this bit has to be done locally
 								revInfoWereLookingFor = dbPull
@@ -796,7 +796,7 @@ namespace Tgstation.Server.Host.Controllers
 						{
 							// goteem
 							Logger.LogDebug("Reusing existing SHA {0}...", revInfoWereLookingFor.CommitSha);
-							await repo.ResetToSha(revInfoWereLookingFor.CommitSha, NextProgressReporter($"Reset to {revInfoWereLookingFor.CommitSha[..7]}"), cancellationToken);
+							await repo.ResetToSha(revInfoWereLookingFor.CommitSha, NextProgressReporter($"Reset to {revInfoWereLookingFor.CommitSha[..7]}"), ct);
 							lastRevisionInfo = revInfoWereLookingFor;
 						}
 
@@ -913,8 +913,7 @@ namespace Tgstation.Server.Host.Controllers
 						databaseContextFactory,
 						progressReporter,
 						ct),
-				cancellationToken)
-				;
+				cancellationToken);
 
 			api.ActiveJob = job.ToApi();
 			return Accepted(api);

From d6239f937fccff5e8c2066e2b433e5c9a17d923d Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Tue, 4 Oct 2022 20:34:17 -0400
Subject: [PATCH 2/2] Version bump to 5.1.4

---
 build/Version.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/Version.props b/build/Version.props
index ff10f216c4..db174ccffb 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -3,7 +3,7 @@
   <!-- Integration tests will ensure they match across the board -->
   <Import Project="ControlPanelVersion.props" />
   <PropertyGroup>
-    <TgsCoreVersion>5.1.3</TgsCoreVersion>
+    <TgsCoreVersion>5.1.4</TgsCoreVersion>
     <TgsConfigVersion>4.4.0</TgsConfigVersion>
     <TgsApiVersion>9.6.0</TgsApiVersion>
     <TgsApiLibraryVersion>10.0.0</TgsApiLibraryVersion>