_layouts/report.html

@@ -6,7 +6,7 @@ layout: default
 
 <p>&larr; <a href="{{ "/news/" | relative_url }}">View all our monthly reports</a></p>
 
-{% unless page.published %}
+{% unless page.date %}
 <div class="col-12 alert alert-warning" role="alert">
   <strong>This is an unpublished draft report.</strong>
   <a href="https://salsa.debian.org/reproducible-builds/reproducible-website/blob/master/_reports/{{ page.year }}-{{ page.month }}.md">(source)</a>

_reports/2019-04.md

@@ -4,7 +4,7 @@ year: "2019"
 month: "04"
 title: "Reproducible Builds in April 2019"
 draft: false
-published: 2019-05-05 17:08:27
+date: 2019-05-05 17:08:27
 ---
 
 **Welcome to the April 2019 report from the [Reproducible Builds](https://reproducible-builds.org) project!** In these now-monthly reports we will outline the most important things which we have been up to in and around the world of reproducible builds & secure toolchains.

_reports/2019-05.md

@@ -4,7 +4,7 @@ year: "2019"
 month: "05"
 title: "Reproducible Builds in May 2019"
 draft: false
-published: 2019-06-06 12:50:39
+date: 2019-06-06 12:50:39
 ---
 
 [![]({{ "/images/reports/2019-05/reproducible-builds.png#right" | relative_url }})](https://reproducible-builds.org/)

_reports/2019-06.md

@@ -4,7 +4,7 @@ year: "2019"
 month: "06"
 title: "Reproducible Builds in June 2019"
 draft: false
-published: 2019-07-05 13:58:08
+date: 2019-07-05 13:58:08
 ---
 
 [![]({{ "/images/reports/2019-06/reproducible-builds.png#right" | relative_url }})](https://reproducible-builds.org/)

_reports/2019-07.md

@@ -4,7 +4,7 @@ year: "2019"
 month: "07"
 title: "Reproducible Builds in July 2019"
 draft: false
-published: 2019-08-05 16:06:30
+date: 2019-08-05 16:06:30
 ---
 
 **Welcome to the July 2019 report from the [Reproducible Builds](https://reproducible-builds.org) project!**

_reports/2019-08.md

@@ -4,7 +4,7 @@ year: "2019"
 month: "08"
 title: "Reproducible Builds in August 2019"
 draft: false
-published: 2019-09-06 11:33:37
+date: 2019-09-06 11:33:37
 ---
 
 [![]({{ "/images/reports/2019-08/reproducible-builds.png#right" | relative_url }})](https://reproducible-builds.org/)

_reports/2019-09.md

@@ -4,7 +4,7 @@ year: "2019"
 month: "09"
 title: "Reproducible Builds in September 2019"
 draft: false
-published: 2019-10-05 20:43:45
+date: 2019-10-05 20:43:45
 ---
 
 **Welcome to the September 2019 report from the [Reproducible Builds]({{ "/" | relative_url }}) project!**

_reports/2019-10.md

@@ -4,7 +4,7 @@ year: "2019"
 month: "10"
 title: "Reproducible Builds in October 2019"
 draft: false
-published: 2019-11-06 18:25:58
+date: 2019-11-06 18:25:58
 ---
 
 **Welcome to the October 2019 report from the [Reproducible Builds]({{ "/" | relative_url }}) project. 👌**

_reports/2019-11.md

@@ -4,7 +4,7 @@ year: "2019"
 month: "11"
 title: "Reproducible Builds in November 2019"
 draft: false
-published: 2019-12-12 16:28:15
+date: 2019-12-12 16:28:15
 ---
 
 **Welcome to the November 2019 report from the [Reproducible Builds](https://reproducible-builds.org) project.**

_reports/2019-12.md

@@ -4,7 +4,7 @@ year: "2019"
 month: "12"
 title: "Reproducible Builds in December 2019"
 draft: false
-published: 2020-01-06 12:54:25
+date: 2020-01-06 12:54:25
 ---
 
 **Welcome to the December 2019 report from the [Reproducible Builds](https://reproducible-builds.org) project!**

_reports/2020-01.md

@@ -4,7 +4,7 @@ year: "2020"
 month: "01"
 title: "Reproducible Builds in January 2020"
 draft: false
-published: 2020-02-10 17:33:36
+date: 2020-02-10 17:33:36
 ---
 
 [![]({{ "/images/reports/2020-01/reproducible-builds.png#right" | relative_url }})](https://reproducible-builds.org/)

_reports/2020-02.md

@@ -4,7 +4,7 @@ year: "2020"
 month: "02"
 title: "Reproducible Builds in February 2020"
 draft: false
-published: 2020-03-06 18:27:51
+date: 2020-03-06 18:27:51
 ---
 
 **Welcome to the February 2020 report from the [Reproducible Builds](https://reproducible-builds.org) project.**

_reports/2020-03.md

@@ -4,7 +4,7 @@ year: "2020"
 month: "03"
 title: "Reproducible Builds in March 2020"
 draft: false
-published: 2020-04-07 09:30:21
+date: 2020-04-07 09:30:21
 ---
 
 **Welcome to the March 2020 report from the [Reproducible Builds](https://reproducible-builds.org) project.** In our reports we outline the most important things that we have been up to over the past month and some plans for the future.

_reports/2020-04.md

@@ -4,7 +4,7 @@ year: "2020"
 month: "04"
 title: "Reproducible Builds in April 2020"
 draft: false
-published: 2020-05-06 15:11:15
+date: 2020-05-06 15:11:15
 ---
 
 **Welcome to the April 2020 report from the [Reproducible Builds]({{ "/" | relative_url }}) project.** In our regular reports we outline the most important things that we and the rest of the community have been up to over the past month.

_reports/2020-05.md

@@ -4,7 +4,7 @@ year: "2020"
 month: "05"
 title: "Reproducible Builds in May 2020"
 draft: false
-published: 2020-06-04 14:42:37
+date: 2020-06-04 14:42:37
 ---
 
 **Welcome to the May 2020 report from the [Reproducible Builds]({{ "/" | relative_url }}) project.**

_reports/2020-06.md

@@ -4,7 +4,7 @@ year: "2020"
 month: "06"
 title: "Reproducible Builds in June 2020"
 draft: false
-published: 2020-07-06 08:11:05
+date: 2020-07-06 08:11:05
 ---
 
 *Welcome to the June 2020 report from the [Reproducible Builds]({{ "/" | relative_url }}) project.* In these reports we outline the most important things that we and the rest of the community have been up to over the past month.

_reports/2020-07.md

@@ -4,7 +4,7 @@ year: "2020"
 month: "07"
 title: "Reproducible Builds in July 2020"
 draft: false
-published: 2020-08-08 15:52:47
+date: 2020-08-08 15:52:47
 ---
 
 [![]({{ "/images/reports/2020-07/reproducible-builds.png#right" | relative_url }})](https://reproducible-builds.org/)

_reports/2020-08.md

@@ -4,7 +4,7 @@ year: "2020"
 month: "08"
 title: "Reproducible Builds in August 2020"
 draft: false
-published: 2020-09-09 18:00:39
+date: 2020-09-09 18:00:39
 ---
 
 **Welcome to the August 2020 report from the [Reproducible Builds](https://reproducible-builds.org) project.**

bin/publish

@@ -25,7 +25,7 @@ fi
 
 if grep -qs 'draft: true' "${FILENAME}"
 then
-	sed -i -e "s@^draft: true@draft: false\npublished: ${DATE}@g" "${FILENAME}"
+	sed -i -e "s@^draft: true@draft: false\ndate: ${DATE}@g" "${FILENAME}"
 fi
 
 git add "${FILENAME}"

blog/index.rss

@@ -12,23 +12,12 @@ layout: null
     <lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
     <generator>Jekyll v{{ jekyll.version }}</generator>
 
-    {% assign reports = site.reports | sort: 'year, month' | where: 'draft', 'false' | reverse %}
+    {% assign items = site.reports | concat: site.posts | sort: 'date' | where: 'draft', 'false' | reverse %}
 
-    {% for x in reports limit:10 %}
+    {% for x in items limit:10 %}
       <item>
         <title>{{ x.title }}</title>
-        <pubDate>{{ x.published | date_to_rfc822 }}</pubDate>
-        <link>{{ x.url | absolute_url }}</link>
-        <guid isPermaLink="true">{{ x.url | absolute_url }}</guid>
-        <description>{{ x.content | xml_escape }}</description>
-      </item>
-    {% endfor %}
-
-    {% assign posts = site.blog | sort: 'published' | reverse %}
-    {% for x in posts limit:10 %}
-      <item>
-        <title>Reproducible Builds: Weekly report #{{ x.week }}</title>
-        <pubDate>{{ x.published | date_to_rfc822 }}</pubDate>
+        <pubDate>{{ x.date | date_to_rfc822 }}</pubDate>
         <link>{{ x.url | absolute_url }}</link>
         <guid isPermaLink="true">{{ x.url | absolute_url }}</guid>
         <description>{{ x.content | xml_escape }}</description>