Skip to content

Commit

Permalink
Prepare for the 20.0.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
@raman-m
raman-m committed Oct 27, 2023
1 parent 640b005 commit f5d94c9
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 47 deletions.
4 changes: 2 additions & 2 deletions ReleaseNotes.md
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
## September 2023 (version {0}) aka [Polish Apple](https://www.google.com/search?q=Polish+Apple) release
> Codenamed as **[Polish Apple](https://www.google.com/search?q=Polish+Apple)**
## Documentation release {0} for [Polish Apple](https://www.google.com/search?q=Polish+Apple), v{1}
Special thanks to @ggnaegi!
88 changes: 43 additions & 45 deletions build.cake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ Task("Release")
.IsDependentOn("Build")
.IsDependentOn("CreateReleaseNotes")
.IsDependentOn("CreateArtifacts")
.IsDependentOn("PublishGitHubRelease")
.IsDependentOn("PublishToNuget");
.IsDependentOn("PublishGitHubRelease");
//.IsDependentOn("PublishToNuget");

Task("Compile")
.IsDependentOn("Clean")
Expand Down Expand Up @@ -138,11 +138,6 @@ Task("CreateReleaseNotes")
{
Information($"Generating release notes at {releaseNotesFile}");

var releaseVersion = versioning.NuGetVersion;
// Read main header from Git file, substitute version in header, and add content further...
var releaseHeader = string.Format(System.IO.File.ReadAllText("./ReleaseNotes.md"), releaseVersion);
var releaseNotes = new List<string> { releaseHeader };

// local helper function
Func<string, IEnumerable<string>> GitHelper = (command) =>
{
Expand All @@ -160,6 +155,11 @@ Task("CreateReleaseNotes")
var lastRelease = lastReleaseTags.First(t => !t.StartsWith("net")); // skip 'net*-vX.Y.Z' tag and take 'major.minor.build'
Information("Last release tag is " + lastRelease);

var releaseVersion = versioning.NuGetVersion;
// Read main header from Git file, substitute version in header, and add content further...
var releaseHeader = string.Format(System.IO.File.ReadAllText("./ReleaseNotes.md"), releaseVersion, lastRelease);
var releaseNotes = new List<string> { releaseHeader };

var shortlogSummary = GitHelper($"shortlog --no-merges --numbered --summary {lastRelease}..HEAD");
var re = new Regex(@"^[\s\t]*(?'commits'\d+)[\s\t]+(?'author'.*)$");
var summary = shortlogSummary
Expand Down Expand Up @@ -296,9 +296,9 @@ Task("CreateReleaseNotes")
}
}
} // END of Top 3
releaseNotes.Add("### Honoring :medal_sports: aka Top Contributors :clap:");
releaseNotes.AddRange(topContributors);
releaseNotes.Add("");
//releaseNotes.Add("### Honoring :medal_sports: aka Top Contributors :clap:");
//releaseNotes.AddRange(topContributors);
//releaseNotes.Add("");
releaseNotes.Add("### Starring :star: aka Release Influencers :bowtie:");
releaseNotes.AddRange(starring);
releaseNotes.Add("");
Expand Down Expand Up @@ -409,26 +409,31 @@ Task("CreateArtifacts")
{
EnsureDirectoryExists(packagesDir);
CopyFiles("./src/**/Release/Ocelot.*.nupkg", packagesDir);
System.IO.File.AppendAllLines(artifactsFile, new[] { "ReleaseNotes.md" });
CopyFiles("./ReleaseNotes.md", packagesDir);
var projectFiles = GetFiles("./src/**/Release/Ocelot.*.nupkg");
foreach(var projectFile in projectFiles)
{
System.IO.File.AppendAllLines(
artifactsFile,
new[] { projectFile.GetFilename().FullPath, "ReleaseNotes.md" }
);
}
// CopyFiles("./src/**/Release/Ocelot.*.nupkg", packagesDir);
// var projectFiles = GetFiles("./src/**/Release/Ocelot.*.nupkg");
// foreach(var projectFile in projectFiles)
// {
// System.IO.File.AppendAllLines(
// artifactsFile,
// new[] { projectFile.GetFilename().FullPath }
// );
// }
var artifacts = System.IO.File.ReadAllLines(artifactsFile)
.Distinct();
foreach(var artifact in artifacts)
{
var codePackage = packagesDir + File(artifact);
Information("Created package " + codePackage);
if (FileExists(codePackage))
{
Information("Created package " + codePackage);
} else {
Information("Package does not exist: " + codePackage);
}
}
});

Expand Down Expand Up @@ -586,14 +591,12 @@ private void CreateGitHubRelease()

var content = new System.Net.Http.StringContent(json, System.Text.Encoding.UTF8, "application/json");

using(var client = new System.Net.Http.HttpClient())
using (var client = new System.Net.Http.HttpClient())
{
client.DefaultRequestHeaders.Authorization =
new System.Net.Http.Headers.AuthenticationHeaderValue(
"Basic", Convert.ToBase64String(
System.Text.ASCIIEncoding.ASCII.GetBytes(
$"{gitHubUsername}:{gitHubPassword}")));

client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue(
"Basic",
Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes($"{gitHubUsername}:{gitHubPassword}"))
);
client.DefaultRequestHeaders.Add("User-Agent", "Ocelot Release");

var result = client.PostAsync("https://api.github.com/repos/ThreeMammals/Ocelot/releases", content).Result;
Expand All @@ -618,14 +621,12 @@ private void UploadFileToGitHubRelease(FilePath file)
var content = new System.Net.Http.ByteArrayContent(data);
content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/octet-stream");

using(var client = new System.Net.Http.HttpClient())
using (var client = new System.Net.Http.HttpClient())
{
client.DefaultRequestHeaders.Authorization =
new System.Net.Http.Headers.AuthenticationHeaderValue(
"Basic", Convert.ToBase64String(
System.Text.ASCIIEncoding.ASCII.GetBytes(
$"{gitHubUsername}:{gitHubPassword}")));

client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue(
"Basic",
Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes($"{gitHubUsername}:{gitHubPassword}"))
);
client.DefaultRequestHeaders.Add("User-Agent", "Ocelot Release");

var result = client.PostAsync($"https://uploads.github.com/repos/ThreeMammals/Ocelot/releases/{releaseId}/assets?name={file.GetFilename()}", content).Result;
Expand All @@ -642,25 +643,22 @@ private void CompleteGitHubRelease()
var request = new System.Net.Http.HttpRequestMessage(new System.Net.Http.HttpMethod("Patch"), $"https://api.github.com/repos/ThreeMammals/Ocelot/releases/{releaseId}");
request.Content = new System.Net.Http.StringContent(json, System.Text.Encoding.UTF8, "application/json");

using(var client = new System.Net.Http.HttpClient())
using (var client = new System.Net.Http.HttpClient())
{
client.DefaultRequestHeaders.Authorization =
new System.Net.Http.Headers.AuthenticationHeaderValue(
"Basic", Convert.ToBase64String(
System.Text.ASCIIEncoding.ASCII.GetBytes(
$"{gitHubUsername}:{gitHubPassword}")));

client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue(
"Basic",
Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes($"{gitHubUsername}:{gitHubPassword}"))
);
client.DefaultRequestHeaders.Add("User-Agent", "Ocelot Release");

var result = client.SendAsync(request).Result;
if(result.StatusCode != System.Net.HttpStatusCode.OK)
if (result.StatusCode != System.Net.HttpStatusCode.OK)
{
throw new Exception("CompleteGitHubRelease result.StatusCode = " + result.StatusCode);
}
}
}


/// gets the resource from the specified url
private async Task<string> GetResourceAsync(string url)
{
Expand Down

0 comments on commit f5d94c9

Please sign in to comment.