Skip to content

Commit 4feae34

Browse files
committed
add news permalink
1 parent e2c27ae commit 4feae34

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/main/scala/MakeReleaseNotes.scala

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ object MakeReleaseNotes {
88
def genPR(prevVersion: String, version: String, release: String, gitDir: String = s"${sys.env("HOME")}/git/scala") = {
99
val date = new java.util.Date(release)
1010
new MakeDownloadPage(version, date).write()
11-
MakeReleaseNotes(new java.io.File(gitDir), s"v$prevVersion", s"v$version", MarkDown, date)
11+
MakeReleaseNotes(new java.io.File(gitDir), version, s"v$prevVersion", s"v$version", MarkDown, date)
1212
}
1313

1414
def write(page: String, version: String, releaseDate: Date, ext: String) = {
@@ -28,15 +28,15 @@ object MakeReleaseNotes {
2828
}
2929
}
3030

31-
def apply(scalaDir: String, previousTag: String, currentTag: String, releaseDate: Date) {
32-
Seq(Html, MarkDown).foreach(fmt => apply(new java.io.File(scalaDir), previousTag, currentTag, fmt, releaseDate))
31+
def apply(scalaDir: String, version: String, previousTag: String, currentTag: String, releaseDate: Date) {
32+
Seq(Html, MarkDown).foreach(fmt => apply(new java.io.File(scalaDir), version, previousTag, currentTag, fmt, releaseDate))
3333
}
34-
def apply(scalaDir: java.io.File, previousTag: String, currentTag: String, targetLanguage: TargetLanguage = MarkDown, releaseDate: Date = new Date()): Unit = {
34+
def apply(scalaDir: java.io.File, version: String, previousTag: String, currentTag: String, targetLanguage: TargetLanguage = MarkDown, releaseDate: Date = new Date()): Unit = {
3535
val out = targetLanguage match {
3636
case Html => new java.io.File("release-notes.html")
3737
case MarkDown => new java.io.File(s"release-notes-${currentTag}.md")
3838
}
39-
val notes = makeReleaseNotes(scalaDir, previousTag, currentTag)(targetLanguage)
39+
val notes = makeReleaseNotes(scalaDir, version, previousTag, currentTag)(targetLanguage)
4040
write(notes, currentTag.dropWhile(_ == 'v'), releaseDate, targetLanguage.ext)
4141
}
4242

@@ -62,7 +62,7 @@ object MakeReleaseNotes {
6262
private def stripTripleDashedHtmlComments(s: String): String =
6363
s.replaceAll("""(?ims)<!---.*?-->""", "")
6464

65-
private def makeReleaseNotes(scalaDir: java.io.File, previousTag: String, currentTag: String)(implicit targetLanguage: TargetLanguage): String = {
65+
private def makeReleaseNotes(scalaDir: java.io.File, version: String, previousTag: String, currentTag: String)(implicit targetLanguage: TargetLanguage): String = {
6666
def rawHandWrittenNotes(file: java.io.File = new java.io.File(s"hand-written.md")): String = {
6767
val lines: List[String] = if (file.exists) {
6868
val src = Source.fromFile(file)
@@ -102,6 +102,7 @@ object MakeReleaseNotes {
102102
case MarkDown => s"""---
103103
layout: news
104104
post-type: announcement
105+
permalink: /news/$version
105106
title: "Scala ${currentTag drop 1} is now available!"
106107
---
107108
${rawHandWrittenNotes()}"""

0 commit comments

Comments
 (0)