From 40cbdd48502cda81e95df235f276d020d8381a15 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 26 Nov 2018 15:49:52 -0500 Subject: [PATCH] Fixup --- .gitignore | 2 +- tgstation-server.sln | 7 +++++++ tools/ReleaseNotes/Program.cs | 12 ++++++------ tools/ReleaseNotes/release_notes.md | 17 ----------------- 4 files changed, 14 insertions(+), 24 deletions(-) delete mode 100644 tools/ReleaseNotes/release_notes.md diff --git a/.gitignore b/.gitignore index 8b0b626b5c..f4f0e4d74f 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,4 @@ artifacts/ /tests/DMAPI/travistester.int /tests/DMAPI/travistester.dmb /src/Tgstation.Server.Host/appsettings.Development.json -/tools/ReleaseNotes/release_nodes.md +/tools/ReleaseNotes/release_notes.md diff --git a/tgstation-server.sln b/tgstation-server.sln index a7fb21ff65..d3155c0ea4 100644 --- a/tgstation-server.sln +++ b/tgstation-server.sln @@ -114,6 +114,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{E821 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tgstation.Server.Tests", "tests\Tgstation.Server.Tests\Tgstation.Server.Tests.csproj", "{09056964-1C74-445A-96EC-33F6DFC07916}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReleaseNotes", "tools\ReleaseNotes\ReleaseNotes.csproj", "{5CB51532-55F0-4255-B6E5-69ED5CCD14CD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -172,6 +174,10 @@ Global {09056964-1C74-445A-96EC-33F6DFC07916}.Debug|Any CPU.Build.0 = Debug|Any CPU {09056964-1C74-445A-96EC-33F6DFC07916}.Release|Any CPU.ActiveCfg = Release|Any CPU {09056964-1C74-445A-96EC-33F6DFC07916}.Release|Any CPU.Build.0 = Release|Any CPU + {5CB51532-55F0-4255-B6E5-69ED5CCD14CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5CB51532-55F0-4255-B6E5-69ED5CCD14CD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5CB51532-55F0-4255-B6E5-69ED5CCD14CD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5CB51532-55F0-4255-B6E5-69ED5CCD14CD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -183,6 +189,7 @@ Global {3BB10856-AA01-43D1-AAB0-A013085426D6} = {7E4E7CF6-A48D-410E-8191-C49C6B5AB9CC} {82066812-6C73-4360-943B-B23F2F491261} = {7E4E7CF6-A48D-410E-8191-C49C6B5AB9CC} {057FAC33-CC31-4948-91C6-B0977C335890} = {F7765A4B-021C-454E-ABB1-2AB1B85F91B4} + {5CB51532-55F0-4255-B6E5-69ED5CCD14CD} = {A55C1117-5808-4AB2-BEA6-4D4A3E66A2F2} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DFD36C95-3E49-41C7-ACDB-86BAF5B18A79} diff --git a/tools/ReleaseNotes/Program.cs b/tools/ReleaseNotes/Program.cs index edd1960dd5..c62af92615 100644 --- a/tools/ReleaseNotes/Program.cs +++ b/tools/ReleaseNotes/Program.cs @@ -75,7 +75,7 @@ namespace ReleaseNotes async Task GetReleaseNotesFromPR(Issue pullRequest) { //need to check it was merged - var fullPr = await client.Repository.PullRequest.Get(RepoOwner, RepoName, pullRequest.Number).ConfigureAwait(false); + var fullPR = await client.Repository.PullRequest.Get(RepoOwner, RepoName, pullRequest.Number).ConfigureAwait(false); async Task GetMilestone() { @@ -151,16 +151,16 @@ namespace ReleaseNotes lock (releaseDictionary) { foreach (var I in notes) - Console.WriteLine("#" + pullRequest.Number + " - " + I + " (@" + user.Login + ")"); - if (releaseDictionary.TryGetValue(pullRequest.Number, out var currentValues)) + Console.WriteLine("#" + fullPR.Number + " - " + I + " (@" + user.Login + ")"); + if (releaseDictionary.TryGetValue(fullPR.Number, out var currentValues)) currentValues.AddRange(notes); else - releaseDictionary.Add(pullRequest.Number, notes); + releaseDictionary.Add(fullPR.Number, notes); } } - var comments = await client.Issue.Comment.GetAllForIssue(RepoOwner, RepoName, pullRequest.Number).ConfigureAwait(false); - await Task.WhenAll(BuildNotesFromComment(pullRequest.Body, pullRequest.User), Task.WhenAll(comments.Select(x => BuildNotesFromComment(x.Body, x.User)))).ConfigureAwait(false); + var comments = await client.Issue.Comment.GetAllForIssue(RepoOwner, RepoName, fullPR.Number).ConfigureAwait(false); + await Task.WhenAll(BuildNotesFromComment(fullPR.Body, fullPR.User), Task.WhenAll(comments.Select(x => BuildNotesFromComment(x.Body, x.User)))).ConfigureAwait(false); } var tasks = new List(); diff --git a/tools/ReleaseNotes/release_notes.md b/tools/ReleaseNotes/release_notes.md deleted file mode 100644 index 25c9366336..0000000000 --- a/tools/ReleaseNotes/release_notes.md +++ /dev/null @@ -1,17 +0,0 @@ -See https://tgstation.github.io/tgstation-server for installation instructions - -## [Changelog for 2.x](https://github.com/tgstation/tgstation-server/milestone/13?closed=1) - -- Added `/datum/tgs_version` to the DMAPI. `/world/TgsVersion()`, `/world/TgsMaximumAPIVersion()`, and `/world/TgsMinimumAPIVersion()` now return this datum (#827) - -## [Changelog for 1.X](https://github.com/tgstation/tgstation-server/milestone/11?closed=1) - -- Added the command line setup wizard. No more need to configure `appsettings.Production.json` manually -- You can now ignore files and folder for symlinking in the `GameStaticFiles` directory using the `.tgsignore` file -- If the repository is configured with valid GitHub synchronization credentials, the user account will now post [test merge comments](https://github.com/tgstation/tgstation/pull/40735#issuecomment-427503427) [when deployments involving them happen](https://github.com/tgstation/tgstation/pull/40736#issuecomment-427503428) -- Releases now contain a `.zip` of the latest DMAPI files -- Installing DirectX on Windows is no longer required for BYOND versions >= 512.1452 -- Updating the server should no longer timeout clients -- Various kinks were ironed out in internal systems - -# [Initial Release](https://github.com/tgstation/tgstation-server/milestone/3?closed=1) \ No newline at end of file