Commit built html

.cirrus.yml

@@ -19,25 +19,6 @@ task:
 
   build_and_test_script: make all
 
-task:
-  name: debian only
-  container:
-    image: debian:bookworm
-  install_script: 
-    - apt update
-    - >
-      apt install -y 
-      curl 
-      jekyll 
-      make 
-      ruby 
-      ruby-jekyll-redirect-from 
-      ruby-kramdown-parser-gfm 
-      ruby-html-proofer
-  build_and_test_script: 
-    - rm Gemfile.lock
-    - make all
-
 task:
   name: verify commits
   only_if: $CIRRUS_BRANCH == 'master'

.gitignore

@@ -1,3 +1,2 @@
-_site
 .sass-cache
 .jekyll-metadata

CONTRIBUTING.md

@@ -12,6 +12,9 @@ Changes to the website are made by pull-request in order to facilitate review pr
 
 All pull-requests must pass the continuous integration tests which test HTML validity, links and images.
 
+All pull requests must include the generated HTML of the website. This can be generated using `make build`.
+CI will check that the committed HTML is built from the source.
+
 Anyone may participate in the review process. All comments and ACK/NACKs will be taken into consideration but the decision about merging rests with the website maintainers.
 
 ## Content Policy

Makefile

@@ -21,3 +21,11 @@ test-fast:
 	! find _site/ -name '*.html' | xargs grep ']\[' | grep -v skip-test | grep .
 	## Ensure that no template strings leak through liquid rendering
 	! find _site/ -name '*.html' | xargs grep '\$$(.*)'
+
+	## Check if the generated site differs
+	@if [ -n "$(shell git status --porcelain -- _site)" ]; then \
+		echo "FAILED: Built site differs from committed"; \
+		false; \
+	else \
+		echo "SUCCESS"; \
+	fi

_config.yml

@@ -12,8 +12,10 @@ highlighter: rouge
 sass:
   sass_dir: _sass
   style: compressed
+  sourcemap: never
 plugins:
   - jekyll-redirect-from
+timezone: "UTC"
 
 kramdown:
   auto_ids: true

_layouts/feed.xml

@@ -3,15 +3,15 @@
     <title type="text">{{ site.title }}</title>
     <link rel="self" type="application/atom+xml" href="{{ site.url }}/{{ page.lang }}/feed.xml" />
     <link rel="alternate" type="text/html" href="{{ site.url }}" />
-    <updated>{{ site.time | date_to_xmlschema }}</updated>
+    {% assign posts=site.posts | where:"lang", page.lang | where:"type", 'posts' %}
+    {% assign advisories=site.posts | where:"lang", 'en' | where:"type", 'advisory' %}
+    {% assign all=advisories | concat: posts | sort: "name" | reverse | sort: "date" | reverse %}
+    <updated>{{ all.first.git-last-modified-date | date_to_xmlschema }}</updated>
     <id>{{ post.id }}</id>
     <author>
         <name>{{ site.owner.name }}</name>
         <uri>{{ site.url }}{{ post.url }}</uri>
     </author>
-    {% assign posts=site.posts | where:"lang", page.lang | where:"type", 'posts' %}
-    {% assign advisories=site.posts | where:"lang", 'en' | where:"type", 'advisory' %}
-    {% assign all=advisories | concat: posts | sort: "date" | reverse %}
     {% for post in all limit:20 %}
     {% if post.author %}
     {% assign author = site.data.authors[post.author] %}

_layouts/home.html

@@ -38,8 +38,8 @@ <h3><a href="{{ navigation.blog.url }}">Recent Posts</a></h3>
       {% assign translated_posts=site.posts | where:"lang", page.lang | where:"type", 'posts' %}
       {% assign advisories=site.posts | where:"lang", 'en' | where:"type", 'advisory' %}
       {% assign translated_advisories=site.posts | where:"lang", page.lang | where:"type", 'advisory' %}
-      {% assign all=advisories | concat: english_posts | sort: "date" | reverse %}
-      {% assign translated_all=translated_advisories | concat: translated_posts | sort: "date" | reverse %}
+      {% assign all=advisories | concat: english_posts | sort: "name" | reverse | sort: "date" | reverse %}
+      {% assign translated_all=translated_advisories | concat: translated_posts | sort: "name" | reverse | sort: "date" | reverse %}
       {% for default_post in all limit:5 %}
       {% assign post=default_post %}
       {% for tpost in translated_all %}

_layouts/post-index.html

@@ -35,10 +35,10 @@ <h1>{{ page.title | xml_escape }}</h1>
     {% capture written_year %}'None'{% endcapture %}
     {% assign english_posts=site.posts | where:"lang", 'en' | where:"type", 'posts' %}
     {% assign advisories=site.posts | where:"lang", 'en' | where:"type", 'advisory' %}
-    {% assign all=advisories | concat: english_posts | sort: "date" | reverse %}
+    {% assign all=advisories | concat: english_posts | sort: "name" | reverse | sort: "date" | reverse %}
     {% assign translated_posts=site.posts | where:"lang", page.lang | where:"type", 'posts' %}
     {% assign translated_advisories=site.posts | where:"lang", page.lang | where:"type", 'advisory' %}
-    {% assign translated_all=translated_advisories | concat: translated_posts | sort: "date" | reverse %}
+    {% assign translated_all=translated_advisories | concat: translated_posts | sort: "name" | reverse | sort: "date" | reverse %}
     {% for default_post in all %}
       {% assign post=default_post %}
       {% for tpost in translated_all %}

_layouts/rss.xml

@@ -7,7 +7,7 @@
         <atom:link href="{{ site.url }}/{{ page.lang }}/rss.xml" rel="self" type="application/rss+xml" />
         {% assign posts=site.posts | where:"lang", page.lang | where:"type", 'posts' %}
         {% assign advisories=site.posts | where:"lang", 'en' | where:"type", 'advisory' %}
-        {% assign all=advisories | concat: posts | sort: "date" | reverse %}
+        {% assign all=advisories | concat: posts | sort: "name" | reverse | sort: "date" | reverse %}
         {% for post in all %}
         <item>
             <title>{{ post.title | strip_html }}</title>

_plugins/git-last-modified-date.rb

@@ -0,0 +1,9 @@
+Jekyll::Hooks.register :documents, :post_init do |post|
+
+  # get the current post last modified time
+  modification_time = `git log -1 --format="%ci" #{post.path}`
+
+  # inject modification_time in post's datas.
+  post.data['git-last-modified-date'] = modification_time
+
+end

_posts/en/pages/2024-06-26-security-advisories.md

@@ -114,7 +114,7 @@ fixed vulnerabilities and their severity levels.
 
 ## Past Security Advisories
 
-{% assign advisories=site.posts | where:"lang", 'en' | where:"type", 'advisory' | sort: "date" | reverse %}
+{% assign advisories=site.posts | where:"lang", 'en' | where:"type", 'advisory' | sort: "name" | reverse | sort: "date" | reverse %}
 {% for advisory in advisories %}
 {% assign post=advisory %}
   <article>

_posts/ja/pages/2024-06-26-security-advisories.md

@@ -100,7 +100,7 @@ version: 1
 
 ## 過去のセキュリティアドバイザリ {#past-security-advisories}
 
-{% assign advisories=site.posts | where:"lang", 'ja' | where:"type", 'advisory' | sort: "date" | reverse %}
+{% assign advisories=site.posts | where:"lang", 'ja' | where:"type", 'advisory' | sort: "name" | reverse | sort: "date" | reverse %}
 {% for advisory in advisories %}
 {% assign post=advisory %}
   <article>

_sass/grid.scss

@@ -2,6 +2,8 @@
    Grid mixins
    ========================================================================== */
 
+@use "sass:math";
+
 /*
    Define number of columns in the grid
    Common values would be 12, 16 or 24
@@ -24,7 +26,7 @@ $margin: 0;
 @mixin grid($grid:$def_grid,$cols:'',$float:left,$display:inline){
   display:$display;
   float:$float;
-  width:(100%/$grid * $cols) - ($margin * 2);
+  width:(math.div(100%, $grid) * $cols) - ($margin * 2);
 }
 
 /*
@@ -33,7 +35,7 @@ $margin: 0;
    ========================================================================== */
 
 @mixin prefix($grid:$def_grid,$cols:''){
-  margin-left:(100%/$grid * $cols);
+  margin-left:(math.div(100%, $grid) * $cols);
 }
 
 /*
@@ -42,7 +44,7 @@ $margin: 0;
    ========================================================================== */
 
 @mixin suffix($grid:$def_grid,$cols:''){
-  margin-right:(100%/$grid * $cols);
+  margin-right:(math.div(100%, $grid) * $cols);
 }
 
 /*
@@ -70,7 +72,7 @@ $margin: 0;
 
 @mixin push($grid:$def_grid,$move:'') {
   position:relative;
-  left:(100%/$grid * $move);
+  left:(math.div(100%, $grid) * $move);
 }
 
 /*
@@ -80,5 +82,5 @@ $margin: 0;
 
 @mixin pull($grid:$def_grid,$move:''){
   position:relative;
-  left:(100%/$grid * $move) * -1;
+  left:(math.div(100%, $grid) * $move) * -1;
 }

_sass/mixins.scss

@@ -2,6 +2,8 @@
    Utility mixins
    ========================================================================== */
 
+@use "sass:math";
+
 /*
    Clearfix
    For clearing floats like a boss h5bp.com/q
@@ -56,10 +58,10 @@
 
 @mixin font-size($size) {
   font-size: 0px + $size;
-  font-size: 0rem + $size / $doc-font-size;
-  line-height: 0 + round($doc-line-height / $size*10000) / 10000;
+  font-size: 0rem + math.div($size, $doc-font-size);
+  line-height: 0 + math.div(round(math.div($doc-line-height, $size) * 10000), 10000);
   margin-bottom: 0px + $doc-line-height;
-  margin-bottom: 0rem + ($doc-line-height / $doc-font-size);
+  margin-bottom: 0rem + math.div($doc-line-height, $doc-font-size);
 }
 
 /*
@@ -69,7 +71,7 @@
 
 @mixin font-rem($size) {
   font-size: 0px + $size;
-  font-size: 0rem + $size / $doc-font-size;
+  font-size: 0rem + math.div($size, $doc-font-size);
 }
 
 /*
@@ -79,8 +81,8 @@
 
 @mixin font($size) {
   font-size: 0px + $size;
-  font-size: 0rem + $size / $doc-font-size;
-  line-height: 0 + round($doc-line-height / $size*10000) / 10000;
+  font-size: 0rem + math.div($size, $doc-font-size);
+  line-height: 0 + math.div(round(math.div($doc-line-height, $size) * 10000), 10000);
 }
 
 /*
@@ -95,7 +97,7 @@
 
 /* Indentation variable */
 
-$indent-var: 0rem + ($doc-line-height / $doc-font-size);
+$indent-var: 0rem + math.div($doc-line-height, $doc-font-size);
 
 /* ==========================================================================
    Gradient mixins

_sass/page.scss

@@ -2,6 +2,8 @@
    Page layout
    ========================================================================== */
 
+@use "sass:math";
+
 body {
 	background-color: $bodycolor;
 	font-family: $base-font;
@@ -131,18 +133,18 @@ $button-size: 1.5rem;
 @mixin navicon-line() {
 	display: inline-block;
 	width: $button-size;
-	height: $button-size/7;
+	height: math.div($button-size, 7);
 	// line color
 	background: $white;
-	border-radius: $button-size/14;
+	border-radius: math.div($button-size, 14);
 	transition: .3s;
 }
 .navicon-lines-button {
-	padding: $button-size/4 $button-size/2;
+	padding: math.div($button-size, 4) math.div($button-size, 2);
 	transition: .3s;
 	cursor: pointer;
 	user-select: none;
-	border-radius: $button-size/7;
+	border-radius: math.div($button-size, 7);
 }
 .navicon-lines-button:hover {
 	opacity: 1;
@@ -152,7 +154,7 @@ $button-size: 1.5rem;
 }
 .navicon-lines {
 	margin-right: 10px;
-	margin-bottom: $button-size/5;
+	margin-bottom: math.div($button-size, 5);
 	// create middle line
 	@include navicon-line;
 	position: relative;
@@ -163,17 +165,17 @@ $button-size: 1.5rem;
 		position: absolute;
 		left: 0;
 		content: '';
-		-webkit-transform-origin: $button-size/14 center;
-		transform-origin: $button-size/14 center;
+		-webkit-transform-origin: math.div($button-size, 14) center;
+		transform-origin: math.div($button-size, 14) center;
 	}
-	&:before { top: $button-size/4; }
-	&:after { top: -$button-size/4; }
+	&:before { top: math.div($button-size, 4); }
+	&:after { top: - math.div($button-size, 4); }
 }
 .navicon-lines-button:hover {
 	opacity: 1;
 	.navicon-lines {
-		&:before { top: $button-size/3.5; }
-		&:after { top: -$button-size/3.5; }
+		&:before { top: math.div($button-size, 3.5); }
+		&:after { top: - math.div($button-size, 3.5); }
 	}
 }
 .navicon-lines-button.x.active .navicon-lines {
@@ -491,7 +493,7 @@ li.lang:hover {
 			@include font-rem(20);
 			&.link-post {
 				margin-bottom: 0px + $doc-line-height;
-				margin-bottom: 0rem + ($doc-line-height / $doc-font-size);
+				margin-bottom: 0rem + math.div($doc-line-height, $doc-font-size);
 			}
 		}
 		p {

_sass/vendor/font-awesome/_fixed-width.scss

@@ -1,6 +1,9 @@
 // Fixed Width Icons
 // -------------------------
+
+@use "sass:math";
+
 .#{$fa-css-prefix}-fw {
-  width: (18em / 14);
+  width: math.div(18em, 14);
   text-align: center;
 }

_sass/vendor/font-awesome/_larger.scss

@@ -1,10 +1,12 @@
 // Icon Sizes
 // -------------------------
 
+@use "sass:math";
+
 /* makes the font 33% larger relative to the icon container */
 .#{$fa-css-prefix}-lg {
-  font-size: (4em / 3);
-  line-height: (3em / 4);
+  font-size: math.div(4em, 3);
+  line-height: math.div(3em, 4);
   vertical-align: -15%;
 }
 .#{$fa-css-prefix}-2x { font-size: 2em; }

_sass/vendor/font-awesome/_list.scss

@@ -1,6 +1,8 @@
 // List Icons
 // -------------------------
 
+@use "sass:math";
+
 .#{$fa-css-prefix}-ul {
   padding-left: 0;
   margin-left: $fa-li-width;
@@ -11,9 +13,9 @@
   position: absolute;
   left: -$fa-li-width;
   width: $fa-li-width;
-  top: (2em / 14);
+  top: math.div(2em, 14);
   text-align: center;
   &.#{$fa-css-prefix}-lg {
-    left: -$fa-li-width + (4em / 14);
+    left: -$fa-li-width + math.div(4em, 14);
   }
 }

_sass/vendor/font-awesome/_variables.scss

@@ -1,6 +1,8 @@
 // Variables
 // --------------------------
 
+@use "sass:math";
+
 $fa-font-path:        "../fonts" !default;
 $fa-font-size-base:   14px !default;
 $fa-line-height-base: 1 !default;
@@ -9,7 +11,7 @@ $fa-css-prefix:       fa !default;
 $fa-version:          "4.5.0" !default;
 $fa-border-color:     #eee !default;
 $fa-inverse:          #fff !default;
-$fa-li-width:         (30em / 14) !default;
+$fa-li-width:         math.div(30em, 14) !default;
 
 $fa-var-500px: "\f26e";
 $fa-var-adjust: "\f042";