about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-02-12 08:57:08 +0000
committerbors <bors@rust-lang.org>2023-02-12 08:57:08 +0000
commit5ef76da8352fdc24ef1576b2ba0ac78e9f599041 (patch)
tree1193f80cf2f3966d68594c16d3cf297bd80a7b1a
parentc29a00457a45238c4195481f02d748a74d8dfb26 (diff)
parent240b6f7f8d512a70d5e01a1de12ffb5b6fb0f0ec (diff)
downloadrust-5ef76da8352fdc24ef1576b2ba0ac78e9f599041.tar.gz
rust-5ef76da8352fdc24ef1576b2ba0ac78e9f599041.zip
Auto merge of #14133 - lnicola:changelog-version, r=lnicola
minor: Add version placeholder to changelog template

Closes #13967

This isn't great because we need to fill it in manually, but getting the version number from GitHub Actions is a bit annoying.
-rw-r--r--xtask/src/publish.rs2
-rw-r--r--xtask/src/release/changelog.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/xtask/src/publish.rs b/xtask/src/publish.rs
index 79b5f3d2f61..cdb7d8fac89 100644
--- a/xtask/src/publish.rs
+++ b/xtask/src/publish.rs
@@ -13,7 +13,7 @@ impl flags::PublishReleaseNotes {
         let tag_name = &file_name[0..10];
         let original_changelog_url = create_original_changelog_url(&file_name);
         let additional_paragraph =
-            format!("\nSee also [original changelog]({original_changelog_url}).");
+            format!("\nSee also the [changelog post]({original_changelog_url}).");
         markdown.push_str(&additional_paragraph);
         if self.dry_run {
             println!("{markdown}");
diff --git a/xtask/src/release/changelog.rs b/xtask/src/release/changelog.rs
index abf4d7a2e16..67538414840 100644
--- a/xtask/src/release/changelog.rs
+++ b/xtask/src/release/changelog.rs
@@ -69,7 +69,7 @@ pub(crate) fn get_changelog(
 :page-layout: post
 
 Commit: commit:{commit}[] +
-Release: release:{today}[]
+Release: release:{today}[] (`TBD`)
 
 == New Features