From e71ecc1fe41141496947a2d17ab94a2b170627f2 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Sat, 28 Apr 2018 00:07:54 -0400 Subject: [PATCH 1/5] build: Add initial Travis-CI setup for gh-pages --- .gitignore | 1 + .travis.yml | 13 +++++++++++++ Gemfile | 3 +++ 3 files changed, 17 insertions(+) create mode 100644 .travis.yml create mode 100644 Gemfile diff --git a/.gitignore b/.gitignore index bd3e973d..edb62cda 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ _site/ .sass-cache/ .jekyll-metadata .DS_Store +Gemfile.lock diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..e8fa246e --- /dev/null +++ b/.travis.yml @@ -0,0 +1,13 @@ +language: node_js + +node_js: + - "node" + +rvm: + - 2.2 + +before_install: + - bundle install + +before_script: + - bundle exec jekyll build diff --git a/Gemfile b/Gemfile new file mode 100644 index 00000000..97355ea7 --- /dev/null +++ b/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' + +gem 'github-pages' From fb73d936239a2ddecf294429cdbd76cd9a1e61d5 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Sat, 28 Apr 2018 00:19:55 -0400 Subject: [PATCH 2/5] chore: Add initial Markdownlint setup Ignore all failures for now --- .gitignore | 1 + .markdownlint.json | 17 ++++ _config.yml | 1 + package-lock.json | 245 +++++++++++++++++++++++++++++++++++++++++++++ package.json | 22 ++++ 5 files changed, 286 insertions(+) create mode 100644 .markdownlint.json create mode 100644 package-lock.json create mode 100644 package.json diff --git a/.gitignore b/.gitignore index edb62cda..8fc80ae6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ _site/ .jekyll-metadata .DS_Store Gemfile.lock +node_modules/ diff --git a/.markdownlint.json b/.markdownlint.json new file mode 100644 index 00000000..530ebc07 --- /dev/null +++ b/.markdownlint.json @@ -0,0 +1,17 @@ +{ + "default": true, + "MD002": false, + "MD003": false, + "MD009": false, + "MD010": false, + "MD012": false, + "MD013": false, + "MD022": false, + "MD023": false, + "MD024": false, + "MD026": false, + "MD032": false, + "MD033": false, + "MD036": false, + "MD041": false +} diff --git a/_config.yml b/_config.yml index 14abb56a..5205d9fe 100644 --- a/_config.yml +++ b/_config.yml @@ -10,6 +10,7 @@ baseurl: "" # the subpath of your site, e.g. /blog url: "http://canada-ca.github.io" # the base hostname & protocol for your site twitter_username: canada-ca github_username: canada-ca +exclude: ['README.md', 'node_modules/'] # Translations title: diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 00000000..75b4d2eb --- /dev/null +++ b/package-lock.json @@ -0,0 +1,245 @@ +{ + "name": "canada-ca.github.io", + "version": "0.0.1", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, + "requires": { + "sprintf-js": "1.0.3" + } + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "commander": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", + "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", + "dev": true, + "requires": { + "graceful-readlink": "1.0.1" + } + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, + "deep-extend": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", + "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", + "dev": true + }, + "entities": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", + "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", + "dev": true + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "get-stdin": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz", + "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=", + "dev": true + }, + "glob": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz", + "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "graceful-readlink": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", + "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "dev": true + }, + "linkify-it": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz", + "integrity": "sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=", + "dev": true, + "requires": { + "uc.micro": "1.0.5" + } + }, + "lodash.differencewith": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.differencewith/-/lodash.differencewith-4.5.0.tgz", + "integrity": "sha1-uvr7yRi1UVTheRdqALsK76rIVLc=", + "dev": true + }, + "lodash.flatten": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", + "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=", + "dev": true + }, + "markdown-it": { + "version": "8.4.1", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.1.tgz", + "integrity": "sha512-CzzqSSNkFRUf9vlWvhK1awpJreMRqdCrBvZ8DIoDWTOkESMIF741UPAhuAmbyWmdiFPA6WARNhnu2M6Nrhwa+A==", + "dev": true, + "requires": { + "argparse": "1.0.10", + "entities": "1.1.1", + "linkify-it": "2.0.3", + "mdurl": "1.0.1", + "uc.micro": "1.0.5" + } + }, + "markdownlint": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.8.1.tgz", + "integrity": "sha512-1ppHJ0NUXL2TfigHJ+P94pqOMvMUpP86CQzlINpgK3zeRshykwsQuaAf2aQu9S8ZYkgJ+FB+iSo1OlrJsbhefw==", + "dev": true, + "requires": { + "markdown-it": "8.4.1" + } + }, + "markdownlint-cli": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.8.1.tgz", + "integrity": "sha512-1M/DrdV4JlL+V6L3GxM2MNgNeZ9qZP4yFisfyKdTO/mhJAsWd92ff8on8X5/NlUVH1XM5QD5qOiAXM/+SHFELA==", + "dev": true, + "requires": { + "commander": "2.9.0", + "deep-extend": "0.4.2", + "get-stdin": "5.0.1", + "glob": "7.0.6", + "lodash.differencewith": "4.5.0", + "lodash.flatten": "4.4.0", + "markdownlint": "0.8.1", + "rc": "1.1.7" + } + }, + "mdurl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", + "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "requires": { + "brace-expansion": "1.1.11" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + }, + "rc": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz", + "integrity": "sha1-xepWS7B6/5/TpbMukGwdOmWUD+o=", + "dev": true, + "requires": { + "deep-extend": "0.4.2", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + } + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true + }, + "uc.micro": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.5.tgz", + "integrity": "sha512-JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg==", + "dev": true + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 00000000..84988bde --- /dev/null +++ b/package.json @@ -0,0 +1,22 @@ +{ + "name": "canada-ca.github.io", + "version": "0.0.1", + "description": "Github pages for Canada-ca", + "main": "index.js", + "scripts": { + "test": "markdownlint -i node_modules \"**/*.md\"" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/canada-ca/canada-ca.github.io.git" + }, + "author": "canada-ca", + "license": "ISC", + "bugs": { + "url": "https://github.com/canada-ca/canada-ca.github.io/issues" + }, + "homepage": "https://github.com/canada-ca/canada-ca.github.io#readme", + "devDependencies": { + "markdownlint-cli": "^0.8.1" + } +} From 173bc7ecd8f41bc566b9090771d36b0b6ccec737 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Sat, 28 Apr 2018 00:21:38 -0400 Subject: [PATCH 3/5] chore: Add EditorConfig setup --- .editorconfig | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..6938ee3b --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +[*] +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true +indent_style = space +indent_size = 2 + +[*.{diff}] +trim_trailing_whitespace = false From 68f19c24a53d8e2573e28431b4197981a0d8d394 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Sat, 28 Apr 2018 00:24:10 -0400 Subject: [PATCH 4/5] build: Make Jekyll failures visiable --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e8fa246e..86e350fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,9 @@ node_js: rvm: - 2.2 -before_install: +before_install: - bundle install -before_script: +script: - bundle exec jekyll build + - npm test From 3842394d9f4454a59b2df3798b14127e878c6039 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Sat, 28 Apr 2018 00:49:23 -0400 Subject: [PATCH 5/5] fix: Liquid syntax errors with img_url These didn't seem to actually output anything --- accueil.html | 58 ++++++++++++++++++-------------------- index.html | 71 ++++++++++++++++++++--------------------------- index_drafts.html | 4 +-- 3 files changed, 59 insertions(+), 74 deletions(-) diff --git a/accueil.html b/accueil.html index d228b281..21ebe2e1 100644 --- a/accueil.html +++ b/accueil.html @@ -4,38 +4,34 @@ lang: fr ---
-

Nouveaux articles

-
- {% assign posts=site.posts | where:"lang", page.lang %} - {% for post in posts %} - - -
- -

{{ post.title }}

{{ post.alt }} -

{{ post.description }} - [{{ post.date | date: "%F" }}]

- -
- - {% endfor %} - -
- -
-
-
-

Suivez

- -
-
-
- +
+ {% assign posts=site.posts | where:"lang", page.lang %} + {% for post in posts %} +
+ +

{{ post.title }}

+ {{ post.alt }} + +

{{ post.description }} - + [{{ post.date | date: "%F" }}] +

+
+ {% endfor %} +
+
+
+
+

Suivez

+ +
+
+

Date de modification : le 27 avril 2018

- diff --git a/index.html b/index.html index 4bf7d327..0f993e6c 100644 --- a/index.html +++ b/index.html @@ -3,49 +3,38 @@ ref: index lang: en --- - -
-

Newest articles

- -
- {% assign posts=site.posts | where:"lang", page.lang %} - {% for post in posts %} - {% unless post.draft %} -
- -

{{ post.title }}

{{ post.alt }} -

{{ post.description }} - [{{ post.date | date: "%F" }}]

- -
- {% endunless %} - {% endfor %} - -
- -
-
-
-

Subscribe

- -
-
-
+
+ {% assign posts=site.posts | where:"lang", page.lang %} + {% for post in posts %} + {% unless post.draft %} +
+ +

{{ post.title }}

+ {{ post.alt }} + +

{{ post.description }} - + [{{ post.date | date: "%F" }}] +

+
+ {% endunless %} + {% endfor %} +
+
+
+
+

Subscribe

+ +
+
+

Date modified: April 27, 2018

- - - - - diff --git a/index_drafts.html b/index_drafts.html index 7f202327..a4af6c54 100644 --- a/index_drafts.html +++ b/index_drafts.html @@ -14,7 +14,7 @@

Newest articles

{% for post in posts %}
-

{{ post.title }}

{{ post.alt }} +

{{ post.title }}

{{ post.alt }}

{{ post.description }} - [{{ post.date | date: "%F" }}]

@@ -43,7 +43,7 @@

Subscribe