From 03d6bea99ad2ed0b9c96ae03c8785e9cc2574bcd Mon Sep 17 00:00:00 2001 From: Dan Trickey Date: Sat, 31 Mar 2018 20:38:57 +0100 Subject: [PATCH 1/5] Add Minutes listing --- content/minutes/_index.md | 6 ++++++ layouts/shortcodes/display_minutes.html | 15 +++++++++++++++ scripts/build.sh | 2 +- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 content/minutes/_index.md create mode 100644 layouts/shortcodes/display_minutes.html diff --git a/content/minutes/_index.md b/content/minutes/_index.md new file mode 100644 index 0000000..2763b26 --- /dev/null +++ b/content/minutes/_index.md @@ -0,0 +1,6 @@ +--- +title: Minutes +weight: 1 +--- + +{{< display_minutes >}} diff --git a/layouts/shortcodes/display_minutes.html b/layouts/shortcodes/display_minutes.html new file mode 100644 index 0000000..3aafd2c --- /dev/null +++ b/layouts/shortcodes/display_minutes.html @@ -0,0 +1,15 @@ +{{ $index := getJSON "https://api.github.com/repositories/73184955/contents" }} + +{{ range sort $index "name" "desc" }} + {{ if eq .type "dir" }} +

{{ .name }}

+ + {{ $year := getJSON "https://api.github.com/repositories/73184955/contents/" .path }} + {{range sort $year "name" "desc" }} + + + + {{ end }} +
{{ humanize (strings.TrimRight ".md" .name) }}
+ {{ end }} +{{ end }} diff --git a/scripts/build.sh b/scripts/build.sh index dca3259..bc0c5d0 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -6,4 +6,4 @@ export PATH=node_modules/.bin:${PATH} rm -rf public/ -hugo -v +hugo -v --ignoreCache From 546d8196f642a68d853e961eaf69fcdc665502ea Mon Sep 17 00:00:00 2001 From: Dan Trickey Date: Sat, 31 Mar 2018 20:41:57 +0100 Subject: [PATCH 2/5] Add extra build script to reduce dev build time --- .spelling | 18 +++++++++--------- netlify.toml | 2 +- scripts/build-online.sh | 9 +++++++++ scripts/build.sh | 2 +- 4 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 scripts/build-online.sh diff --git a/.spelling b/.spelling index 9582fb2..a468c6d 100644 --- a/.spelling +++ b/.spelling @@ -1,29 +1,29 @@ 000 Please ensure this file is ALPHABETICALLY SORTED, (numbers, uppercase, lower case), this is to ensure merging works properly 6pm -CircleCI -GitHub -Mainroad -Netlify -SourceBots blocklyscienceday +CircleCI compstate-smallpeice2017 dfu-bootloader dropdown +GitHub +Mainroad mixtape-smallpeice2017 motor-v4-fw motor-v4-hw -pcb-util +Netlify pcbmedals +pcb-util pkg +powerman power-v4-fw power-v4-hw -powerman robot-api robotd runusb -sb-techday -sb-vision sb2018-game-presentation sb2018-rules +sb-techday +sb-vision +SourceBots srcomp-kiosk sym diff --git a/netlify.toml b/netlify.toml index e503c24..3488578 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1,6 +1,6 @@ [build] publish = "public/" - command = "./scripts/build.sh" + command = "./scripts/build-online.sh" [context.production.environment] HUGO_VERSION = "0.33" diff --git a/scripts/build-online.sh b/scripts/build-online.sh new file mode 100644 index 0000000..bc0c5d0 --- /dev/null +++ b/scripts/build-online.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -e + +export PATH=node_modules/.bin:${PATH} + +rm -rf public/ + +hugo -v --ignoreCache diff --git a/scripts/build.sh b/scripts/build.sh index bc0c5d0..dca3259 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -6,4 +6,4 @@ export PATH=node_modules/.bin:${PATH} rm -rf public/ -hugo -v --ignoreCache +hugo -v From 24e0c13d0172352f7b78a58f9875bd3727ad0e7a Mon Sep 17 00:00:00 2001 From: Dan Trickey Date: Sat, 31 Mar 2018 20:42:49 +0100 Subject: [PATCH 3/5] Make CircleCI run new build script --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aa85c9b..dfd23db 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: command: npm install - run: name: Build site - command: ./scripts/build.sh + command: ./scripts/build-online.sh - run: name: Run Tests command: npm run ci-test From 0672a0807ad2cccdc2bb04ca11ccf5fbfaad1059 Mon Sep 17 00:00:00 2001 From: Dan Trickey Date: Sat, 31 Mar 2018 20:50:42 +0100 Subject: [PATCH 4/5] Set execute bit on build script --- scripts/build-online.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/build-online.sh diff --git a/scripts/build-online.sh b/scripts/build-online.sh old mode 100644 new mode 100755 From 4e23a7b0a2e48f4c2af34984334f0e4ffcb3a291 Mon Sep 17 00:00:00 2001 From: Dan Trickey Date: Sat, 31 Mar 2018 21:08:16 +0100 Subject: [PATCH 5/5] Replace with .spelling from master to try and fix spelling error --- .spelling | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.spelling b/.spelling index a468c6d..9582fb2 100644 --- a/.spelling +++ b/.spelling @@ -1,29 +1,29 @@ 000 Please ensure this file is ALPHABETICALLY SORTED, (numbers, uppercase, lower case), this is to ensure merging works properly 6pm -blocklyscienceday CircleCI +GitHub +Mainroad +Netlify +SourceBots +blocklyscienceday compstate-smallpeice2017 dfu-bootloader dropdown -GitHub -Mainroad mixtape-smallpeice2017 motor-v4-fw motor-v4-hw -Netlify -pcbmedals pcb-util +pcbmedals pkg -powerman power-v4-fw power-v4-hw +powerman robot-api robotd runusb -sb2018-game-presentation -sb2018-rules sb-techday sb-vision -SourceBots +sb2018-game-presentation +sb2018-rules srcomp-kiosk sym