diff --git a/.gitignore b/.gitignore index 68cd65bcdb..0f638f5de3 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,5 @@ artifacts/ /src/Tgstation.Server.Host/ClientApp/node_modules /src/Tgstation.Server.Host/ClientApp/build /tools/ReleaseNotes/release_notes.md +/tools/ReleaseNotes/Properties/launchSettings.json release_notes.md \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 8917f359e1..e90bac7850 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,7 +10,7 @@ environment: TGS4_TEST_DISCORD_TOKEN: secure: 5ENtMfhHDI6SOgZ9nP7oHX//nZ1w5cYSk3a17MO54+jmcZwEtwZPB4XvVKgtY2xIacjp96ZWNnQgIyfRHvnHSg== TGS4_TEST_DISCORD_CHANNEL: 493119635319947269 - TGS_RELEASE_NOTES_TOKEN: + TGS4_RELEASE_NOTES_TOKEN: secure: lJNGAXwiB5HlWdthz3K4PetqpTG5IEAyRgKaiKxFMQ8HW8CcOjRtB97B05op7BsK branches: diff --git a/tools/ReleaseNotes/Program.cs b/tools/ReleaseNotes/Program.cs index 167d47543e..fdfb2162e3 100644 --- a/tools/ReleaseNotes/Program.cs +++ b/tools/ReleaseNotes/Program.cs @@ -34,7 +34,7 @@ namespace ReleaseNotes var doNotCloseMilestone = args.Length >= 2 && args[1].ToUpperInvariant() == "--NO-CLOSE"; - const string ReleaseNotesEnvVar = "TGS_RELEASE_NOTES_TOKEN"; + const string ReleaseNotesEnvVar = "TGS4_RELEASE_NOTES_TOKEN"; var githubToken = Environment.GetEnvironmentVariable(ReleaseNotesEnvVar); if (String.IsNullOrWhiteSpace(githubToken)) { @@ -95,7 +95,6 @@ namespace ReleaseNotes { var commentSplits = comment.Split('\n'); var notesOpen = false; - var notesClosed = false; var notes = new List(); foreach (var line in commentSplits) { @@ -103,12 +102,10 @@ namespace ReleaseNotes if (!notesOpen) { notesOpen = trimmedLine.StartsWith(":cl:", StringComparison.Ordinal); - notesClosed = false; continue; } if (trimmedLine.StartsWith("/:cl:", StringComparison.Ordinal)) { - notesClosed = true; notesOpen = false; continue; } @@ -116,7 +113,7 @@ namespace ReleaseNotes continue; notes.Add(trimmedLine); } - if (!notesClosed || notes.Count == 0) + if (notesOpen || notes.Count == 0) return; Task authTask; @@ -241,7 +238,7 @@ namespace ReleaseNotes { newNotes.Append("## [Changelog for "); newNotes.Append(version.Build); - newNotes.Append(".x"); + newNotes.Append(".X"); } else {