From d58ef02d31a7b5332eb614752f2d18d55e464004 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Tue, 19 Dec 2023 22:24:32 -0500 Subject: [PATCH] This property is meant to be nullable --- .../Components/Deployment/DreamMaker.cs | 3 ++- src/Tgstation.Server.Host/Models/CompileJob.cs | 16 ++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs b/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs index 255c07dd54..89f69f7d7b 100644 --- a/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs +++ b/src/Tgstation.Server.Host/Components/Deployment/DreamMaker.cs @@ -488,10 +488,11 @@ namespace Tgstation.Server.Host.Components.Deployment repository.RemoteRepositoryName, localCommitExistsOnRemote); - var compileJob = new Models.CompileJob(job, revisionInformation, engineLock.Version.ToString(), repository.Origin.ToString()) + var compileJob = new Models.CompileJob(job, revisionInformation, engineLock.Version.ToString()) { DirectoryName = Guid.NewGuid(), DmeName = dreamMakerSettings.ProjectName, + RepositoryOrigin = repository.Origin.ToString(), }; progressReporter.StageName = "Creating remote deployment notification"; diff --git a/src/Tgstation.Server.Host/Models/CompileJob.cs b/src/Tgstation.Server.Host/Models/CompileJob.cs index ea729e9217..0f75b830e7 100644 --- a/src/Tgstation.Server.Host/Models/CompileJob.cs +++ b/src/Tgstation.Server.Host/Models/CompileJob.cs @@ -50,7 +50,7 @@ namespace Tgstation.Server.Host.Models /// /// The origin of the repository the compile job was built from. /// - public string RepositoryOrigin { get; set; } + public string? RepositoryOrigin { get; set; } /// /// The source GitHub repository the deployment came from if any. @@ -86,7 +86,7 @@ namespace Tgstation.Server.Host.Models /// [Obsolete("For use by EFCore only", true)] public CompileJob() - : this(null!, null!, null!, null!, false) + : this(null!, null!, null!, false) { } @@ -96,9 +96,8 @@ namespace Tgstation.Server.Host.Models /// The value of . /// The value of . /// The value of . - /// The value of . - public CompileJob(Job job, RevisionInformation revisionInformation, string engineVersion, string repositoryOrigin) - : this(job, revisionInformation, engineVersion, repositoryOrigin, true) + public CompileJob(Job job, RevisionInformation revisionInformation, string engineVersion) + : this(job, revisionInformation, engineVersion, true) { } @@ -108,22 +107,19 @@ namespace Tgstation.Server.Host.Models /// The value of . /// The value of . /// The value of . - /// The value of . - /// If , , and should be checked for nulls. - CompileJob(Job job, RevisionInformation revisionInformation, string engineVersion, string repositoryOrigin, bool nullChecks) + /// If , , and should be checked for nulls. + CompileJob(Job job, RevisionInformation revisionInformation, string engineVersion, bool nullChecks) { if (nullChecks) { ArgumentNullException.ThrowIfNull(job); ArgumentNullException.ThrowIfNull(revisionInformation); ArgumentNullException.ThrowIfNull(engineVersion); - ArgumentNullException.ThrowIfNull(repositoryOrigin); } Job = job; RevisionInformation = revisionInformation; EngineVersion = engineVersion; - RepositoryOrigin = repositoryOrigin; } ///