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

Fix auto-updater not setting initial revinfo

Browse Source
This commit is contained in:
Jordan Brown
2021-08-28 13:57:46 -04:00
parent f10b31c18d
commit 515df95f04
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Instance.cs
+18 -20
View File
@@ -308,27 +308,14 @@ namespace Tgstation.Server.Host.Components
cancellationToken)
.ConfigureAwait(false);
RevisionInformation currentRevInfo = null;
Task<RevisionInformation> LoadRevInfo() => databaseContext.RevisionInformations
.AsQueryable()
.Where(x => x.CommitSha == startSha && x.Instance.Id == metadata.Id)
.Include(x => x.ActiveTestMerges).ThenInclude(x => x.TestMerge)
.FirstOrDefaultAsync(cancellationToken);
.AsQueryable()
.Where(x => x.CommitSha == startSha && x.Instance.Id == metadata.Id)
.Include(x => x.ActiveTestMerges).ThenInclude(x => x.TestMerge)
.FirstOrDefaultAsync(cancellationToken);
RevisionInformation currentRevInfo = null;
var hasDbChanges = false;
// take appropriate auto update actions
var shouldSyncTracked = false;
var currentRevInfoTask = LoadRevInfo();
var result = await repo.MergeOrigin(
repositorySettings.CommitterName,
repositorySettings.CommitterEmail,
NextProgressReporter(),
cancellationToken)
.ConfigureAwait(false);
async Task UpdateRevInfo(string currentHead, bool onOrigin, IEnumerable<RevInfoTestMerge> updatedTestMerges)
{
if (currentRevInfo == null)
@@ -363,14 +350,25 @@ namespace Tgstation.Server.Host.Components
hasDbChanges = true;
}
// build current commit data if it's missing
await UpdateRevInfo(repo.Head, false, null).ConfigureAwait(false);
var result = await repo.MergeOrigin(
repositorySettings.CommitterName,
repositorySettings.CommitterEmail,
NextProgressReporter(),
cancellationToken)
.ConfigureAwait(false);
var preserveTestMerges = repositorySettings.AutoUpdatesKeepTestMerges.Value;
var remoteDeploymentManager = remoteDeploymentManagerFactory.CreateRemoteDeploymentManager(
metadata,
repo.RemoteGitProvider.Value);
// take appropriate auto update actions
var shouldSyncTracked = false;
if (result.HasValue)
{
currentRevInfo = await currentRevInfoTask.ConfigureAwait(false);
var updatedTestMerges = await remoteDeploymentManager.RemoveMergedTestMerges(
repo,
repositorySettings,