From e65f54ff62a3585d63cb035d6f6fb8ab6210ad13 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sat, 27 Apr 2019 20:42:31 +0100 Subject: [PATCH] Update to Hugo 0.55 --- .circleci/config.yml | 2 +- layouts/_default/list.html | 11 +++++++---- layouts/_default/rss.xml | 2 +- layouts/partials/nav_pages.html | 2 +- netlify.toml | 2 +- scripts/build.sh | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0d55d63..538ae23 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,7 +13,7 @@ jobs: command: git submodule sync && git submodule update --init - run: name: Install Hugo - command: wget https://github.com/gohugoio/hugo/releases/download/v0.52/hugo_extended_0.52_Linux-64bit.deb -O /tmp/hugo.deb && sudo dpkg -i /tmp/hugo.deb + command: wget https://github.com/gohugoio/hugo/releases/download/v0.55.4/hugo_extended_0.55.4_Linux-64bit.deb -O /tmp/hugo.deb && sudo dpkg -i /tmp/hugo.deb - restore_cache: key: npm-{{ checksum "package-lock.json" }} - run: diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 1d042a2..a8767d2 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -5,10 +5,13 @@ {{ if .Content }}
{{ end }} - {{ $sorted_pages := sort .Site.Pages "Title" "asc" }} - {{ $valid_pages := where $sorted_pages ".Parent" "!=" nil }} - {{ range where $valid_pages ".Parent.UniqueID" .UniqueID }} - {{ partial "list_item.html" . }} + {{ $unique_id := .File.UniqueID }} + {{ range .Site.Pages.ByTitle }} + {{ if .Parent }} + {{ if eq .Parent.File.UniqueID $unique_id }} + {{ partial "list_item.html" . }} + {{ end }} + {{ end }} {{ end }} diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index 1151f71..2c660ef 100644 --- a/layouts/_default/rss.xml +++ b/layouts/_default/rss.xml @@ -4,7 +4,7 @@ {{ .Title }} {{ .Permalink }} Recent content in {{ .Title }} - Hugo {{ .Hugo.Version }} -- gohugo.io + Hugo {{ hugo.Version }} -- gohugo.io {{ .Site.LanguageCode }} {{ partial "copyright.html" . | html }} {{ .Site.Params.author }} diff --git a/layouts/partials/nav_pages.html b/layouts/partials/nav_pages.html index 394fc40..53c6b28 100644 --- a/layouts/partials/nav_pages.html +++ b/layouts/partials/nav_pages.html @@ -1,6 +1,6 @@ {{ $home := .Site.GetPage "home" }} -{{ $sections := where (where .Site.Pages.ByTitle "Kind" "section") "Parent.UniqueID" $home.UniqueID }} +{{ $sections := where (where .Site.Pages.ByTitle "Kind" "section") "Parent.File.UniqueID" $home.File.UniqueID }} {{ $pages := where .Site.RegularPages.ByTitle "Section" "" }} {{ $nav_pages := union $pages $sections }} diff --git a/netlify.toml b/netlify.toml index 67023e0..cb7b997 100644 --- a/netlify.toml +++ b/netlify.toml @@ -3,7 +3,7 @@ command = "./scripts/release.sh" [build.environment] - HUGO_VERSION = "0.54.0" + HUGO_VERSION = "0.55.4" NODE_ENV = "production" NPM_CONFIG_PRODUCTION = "false" diff --git a/scripts/build.sh b/scripts/build.sh index b8158f6..8605756 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -24,7 +24,7 @@ browserify $STATIC_SRC/js/index.js -o $STATIC_BUILD/js/app.js cp -r $STATIC_SRC/scss $STATIC_BUILD/scss hugo gen chromastyles --style=monokai > $STATIC_BUILD/css/highlight.css -hugo -vDEF --stepAnalysis --gc $HUGO_ARGS +hugo -vDEF --gc $HUGO_ARGS cp $BASEDIR/static/keybase.txt $OUTPUT_DIR/keybase.txt