[Git][reproducible-builds/reproducible-website][master] 5 commits: README: Drop outdated (or at least unreliable) instructions

Chris Lamb gitlab at salsa.debian.org
Wed Apr 24 11:32:30 CEST 2019



Chris Lamb pushed to branch master at Reproducible Builds / reproducible-website


Commits:
8c6b19ea by Chris Lamb at 2019-04-24T08:52:10Z
README: Drop outdated (or at least unreliable) instructions

- - - - -
595d29be by Chris Lamb at 2019-04-24T08:54:11Z
Add a simple .gitlab-ci.yml to test building.

- - - - -
28843064 by Chris Lamb at 2019-04-24T08:59:56Z
Drop unnecessary unicode from comments as it causes Jekyll on stable to choke.

- - - - -
2f27517c by Chris Lamb at 2019-04-24T09:29:45Z
Use an explicit "draft" flag - jekyll in stable silently does not support where_exp.

This reverts commit b76dc568f80a938f89f2dfa5356dc2902ac31262.

- - - - -
cda3f5f0 by Chris Lamb at 2019-04-24T09:31:58Z
Move reports to a YYYY-MM URI scheme.

- - - - -


8 changed files:

- + .gitlab-ci.yml
- README
- _reports/201904.md → _reports/2019-04.md
- assets/styles/vars.scss
- bin/generate-draft.template
- bin/publish
- blog/index.rss
- reports.md


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -0,0 +1,8 @@
+before_script:
+  - apt-get -q update
+  - env DEBIAN_FRONTEND=noninteractive apt-get -q -y install jekyll
+
+test:
+  image: debian:stable
+  script:
+    - jekyll build --verbose --trace


=====================================
README
=====================================
@@ -29,28 +29,3 @@ Building the website is made by running:
     $ jekyll build
 
 The result will be available in the `_site` directory.
-
-News
-----
-
-News are made using Jekyll blog posts. Adding news is a matter of
-creating new pages in th `_posts` directory.
-
-Documentation
--------------
-
-The documentation homepage is in `docs.html`. Individual pages are kept
-in the `_docs` folder.
-
-The order in the index and the title of subsection is defined in
-`_data/docs.yml`. The order defined using permalinks (and not
-file names).
-
-Projects
---------
-
-The list of project involved in reproducible builds is kept as YAML
-in `_data/projects.yml`.
-
-Logos must be in the `images/logos` folder. Images should be 124×124
-pixels large.


=====================================
_reports/201904.md → _reports/2019-04.md
=====================================
@@ -3,6 +3,7 @@ layout: new/report
 year: "2019"
 month: "04"
 title: "Reproducible Builds in April 2019"
+draft: true
 ---
 
 * fontconfig


=====================================
assets/styles/vars.scss
=====================================
@@ -5,21 +5,21 @@ $font: 'Overpass', sans-serif !important;
 // Open color
 //
 //
-//  𝗖 𝗢 𝗟 𝗢 𝗥
+//
 //  v 1.6.2
 //
-//  ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//
 
 
 //  General
-//  ───────────────────────────────────
+//
 
 $oc-white:         #ffffff;
 $oc-black:         #000000;
 
 
 //  Gray
-//  ───────────────────────────────────
+//
 
 $oc-gray-list: (
         "0": #f8f9fa,
@@ -43,4 +43,4 @@ $oc-gray-5: map-get($oc-gray-list, "5");
 $oc-gray-6: map-get($oc-gray-list, "6");
 $oc-gray-7: map-get($oc-gray-list, "7");
 $oc-gray-8: map-get($oc-gray-list, "8");
-$oc-gray-9: map-get($oc-gray-list, "9");
\ No newline at end of file
+$oc-gray-9: map-get($oc-gray-list, "9");


=====================================
bin/generate-draft.template
=====================================
@@ -3,6 +3,7 @@ layout: new/report
 year: "{{ title_year }}"
 month: "{{ title_month }}"
 title: "{{ title }}"
+draft: true
 ---
 
 * On [our mailing list](https://lists.reproducible-builds.org/pipermail/rb-general/) this month: FIXME


=====================================
bin/publish
=====================================
@@ -4,9 +4,9 @@ set -eu
 
 YEAR="${1}"
 MONTH="$(printf "%02d" "${2}")"
-TAG="${YEAR}${MONTH}"
+TAG="${YEAR}-${MONTH}"
 
-URL="https://reproducible-builds.org/blog/reports/${YEAR}${MONTH}/"
+URL="https://reproducible-builds.org/blog/reports/${TAG}/"
 DATE="$(date --utc +'%Y-%m-%d %H:%M:%S')"
 
 if ! shift 2
@@ -23,9 +23,9 @@ then
 	exit 2
 fi
 
-if ! grep -qs 'published: ' "${FILENAME}"
+if ! grep -qs 'draft: true' "${FILENAME}"
 then
-	sed -i -e "s@^\(title: .*\)@\1\npublished: ${DATE}@g" "${FILENAME}"
+	sed -i -e "s@^draft: true at draft: false\npublished: ${DATE}@g" "${FILENAME}"
 fi
 
 git add "${FILENAME}"


=====================================
blog/index.rss
=====================================
@@ -12,7 +12,19 @@ layout: null
     <lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
     <generator>Jekyll v{{ jekyll.version }}</generator>
 
-    {% assign posts = site.blog | sort: 'published' | where_exp: 'item', 'item.published' | reverse %}
+    {% assign reports = site.reports | sort: 'year, month' | where: 'draft', 'false' | reverse %}
+
+    {% for x in reports limit:10 %}
+      <item>
+        <title>{{ x.title }}</title>
+        <pubDate>{{ x.published | date_to_rfc822 }}</pubDate>
+        <link>{{ x.url | prepend: site.url }}</link>
+        <guid isPermaLink="true">{{ x.url | prepend: site.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>


=====================================
reports.md
=====================================
@@ -5,11 +5,29 @@ permalink: /reports/
 order: 6
 ---
 
+{% assign reports = site.reports | sort: 'year, month' | where: 'draft', 'false' | reverse %}
+
+{% if reports.size > 0 %}
+
+# Reports
+Every month we publish a report on what we have been up to. ([RSS/Atom feed]({{ "/blog/index.rss" | prepend: site.baseurl }}))
+
+{% for x in reports %}
+* [{{ x.title }}]({{ x.url | prepend: site.baseurl }})
+{% endfor %}
+
+## Weekly reports
+
+We previously published weekly reports on what we have been up to:
+{% else %}
+
 # Blog
 
 Every week we publish a weekly report on what we have been up to. ([RSS/Atom feed]({{ "/blog/index.rss" | prepend: site.baseurl }}))
 
-{% assign posts = site.blog | sort: 'week' | where_exp: 'item', 'item.published' | reverse %}
+{% endif %}
+
+{% assign posts = site.blog | sort: 'published' | reverse %}
 
 {% for x in posts %}
 * [Week {{ x.week }}]({{ x.url | prepend: site.baseurl }})



View it on GitLab: https://salsa.debian.org/reproducible-builds/reproducible-website/compare/08cedf3d6d1b3be3985c4b7852061500ae4859ea...cda3f5f0ec6f239d0a9aeb24ab96d820a60fe7f9

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/reproducible-website/compare/08cedf3d6d1b3be3985c4b7852061500ae4859ea...cda3f5f0ec6f239d0a9aeb24ab96d820a60fe7f9
You're receiving this email because of your account on salsa.debian.org.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20190424/de08f682/attachment.html>


More information about the rb-commits mailing list