From 005290ddb57c3944ed3565508f40fb2ca883ae01 Mon Sep 17 00:00:00 2001 From: "max.mehl" Date: Wed, 20 Sep 2017 00:20:46 +0200 Subject: [PATCH 1/4] Try build 3 times before failing with exit code 1 --- site/build/build.sh | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/site/build/build.sh b/site/build/build.sh index f110037..b6e1ddd 100755 --- a/site/build/build.sh +++ b/site/build/build.sh @@ -19,10 +19,25 @@ if [ "$mode" == "server" ]; then elif [ "$mode" == "syntax" ]; then hugo else - hugo + status=1 + tries=0 + while [[ $status -ne 0 ]]; do - ## - ## After building the website, we set the AWS credentials and uplodad + hugo + status=$? + + (( tries++ )) + + if [[ $status != 0 && $tries -le 2 ]]; then + echo "Build error with exit status $status on try $tries. Try again now" + elif [[ $status != 0 && $tries -gt 2 ]]; then + echo "Build failed 3 times in a row. Don't try again." + exit 1 + fi + + done + + ## After successfully building the website, we set the AWS credentials and uplodad ## everything to our AWS s3 bucket. ## #if [ -f /srv/cred/aws.sh ]; then From 01acc62526d726aa517fdf7eb6a83e4eafffd69f Mon Sep 17 00:00:00 2001 From: "max.mehl" Date: Wed, 20 Sep 2017 15:48:00 +0200 Subject: [PATCH 2/4] Add meta keywords to head --- site/layouts/partials/head.html | 1 + 1 file changed, 1 insertion(+) diff --git a/site/layouts/partials/head.html b/site/layouts/partials/head.html index 9a8549b..62a34c1 100644 --- a/site/layouts/partials/head.html +++ b/site/layouts/partials/head.html @@ -4,6 +4,7 @@ {{ with .Site.Params.static.meta.author }}{{ end }} {{ with .Site.Params.description }}{{ end }} + {{ .Hugo.Generator }} {{ with .Params.Title }}{{ . }} - {{ end }}{{ .Site.Title }} {{ "" | safeHTML }} From d177871e89864258030712520e9b91cc23cf3064 Mon Sep 17 00:00:00 2001 From: Florian Snow Date: Wed, 20 Sep 2017 17:00:36 +0200 Subject: [PATCH 3/4] Fix HTML 5 subtitles closes #155 --- .../partials/functions/video_fsfe.html | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/site/layouts/partials/functions/video_fsfe.html b/site/layouts/partials/functions/video_fsfe.html index 313b5ed..7fc05eb 100644 --- a/site/layouts/partials/functions/video_fsfe.html +++ b/site/layouts/partials/functions/video_fsfe.html @@ -9,25 +9,25 @@ - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + From fec5e29386862b2c4749e2d6ca780a6e43f82843 Mon Sep 17 00:00:00 2001 From: Max Mehl Date: Wed, 20 Sep 2017 17:34:59 +0200 Subject: [PATCH 4/4] trigger build --- fake-commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fake-commit b/fake-commit index f091343..7809620 100644 --- a/fake-commit +++ b/fake-commit @@ -1,3 +1,3 @@ A file to do fake commits to trigger the build after a PR has been merged. -fake10 \ No newline at end of file +fake11 \ No newline at end of file