From 2059151686e12cc4b6b1ae04adc3ecad1db65ab8 Mon Sep 17 00:00:00 2001 From: Aaron Hurt Date: Fri, 24 Jan 2020 14:31:10 -0600 Subject: [PATCH] minor transition updates (#745) * create 404 template in docs/layouts/404.html * remove magiconair repo from .goreleaser.yml * remove magiconair repo from build/homebrew.sh * update LICENSE and docs/layouts/partials/footer.html with correct dates * test doc site generation during travis test * always pass $GOFLAGS to build and test * do not call mod target for every build --- .goreleaser.yml | 2 -- LICENSE | 5 +++-- Makefile | 14 ++++++++++---- build/homebrew.sh | 10 ++++++---- docs/layouts/404.html | 15 +++++++++++++++ docs/layouts/partials/footer.html | 5 +++-- main.go | 2 +- 7 files changed, 38 insertions(+), 15 deletions(-) create mode 100644 docs/layouts/404.html diff --git a/.goreleaser.yml b/.goreleaser.yml index 12daae0b9..338af8bef 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -35,7 +35,5 @@ dockers: image_templates: - 'fabiolb/fabio:latest' - 'fabiolb/fabio:{{ .Version }}-{{ .Env.GOVERSION }}' - - 'magiconair/fabio:latest' - - 'magiconair/fabio:{{ .Version }}-{{ .Env.GOVERSION }}' extra_files: - fabio.properties diff --git a/LICENSE b/LICENSE index 2b7a482e0..6905facf7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,8 @@ The MIT License (MIT) -Copyright (c) 2017 Frank Schroeder. All rights reserved. (after 15 Apr 2017/commit 38f73da6413b68fed1631101ac1d0b79a2fac870) -Copyright (c) 2015 eBay Software Foundation. All rights reserved. (before 15 Apr 2017/commit 38f73da6413b68fed1631101ac1d0b79a2fac870) +Copyright (c) 2020 Education Networks of America. All rights reserved. +Copyright (c) 2017-2020 Frank Schroeder. All rights reserved. (after 15 Apr 2017/commit 38f73da6413b68fed1631101ac1d0b79a2fac870) +Copyright (c) 2015-2017 eBay Software Foundation. All rights reserved. (before 15 Apr 2017/commit 38f73da6413b68fed1631101ac1d0b79a2fac870) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Makefile b/Makefile index 9d8a71d9f..75a69334a 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,7 @@ GORELEASER ?= $(shell which goreleaser) # pin versions for CI builds CI_CONSUL_VERSION ?= 1.6.2 CI_VAULT_VERSION ?= 1.3.1 +CI_HUGO_VERSION ?= 0.62.2 # all is the default target all: test @@ -38,12 +39,12 @@ help: @echo "clean - remove temp files" # build compiles fabio and the test dependencies -build: gofmt mod - go build +build: gofmt + go build $(GOFLAGS) # test runs the tests test: build - go test -v -test.timeout 15s ./... + go test $(GOFLAGS) -v -test.timeout 15s ./... mod: go mod tidy @@ -114,11 +115,16 @@ travis: go env wget -O ~/consul.zip https://releases.hashicorp.com/consul/$(CI_CONSUL_VERSION)/consul_$(CI_CONSUL_VERSION)_linux_amd64.zip wget -O ~/vault.zip https://releases.hashicorp.com/vault/$(CI_VAULT_VERSION)/vault_$(CI_VAULT_VERSION)_linux_amd64.zip + wget -O ~/hugo.tgz https://github.com/gohugoio/hugo/releases/download/v$(CI_HUGO_VERSION)/hugo_$(CI_HUGO_VERSION)_Linux-64bit.tar.gz unzip -o -d ~/bin ~/consul.zip unzip -o -d ~/bin ~/vault.zip + tar -C ~/bin -zxf ~/hugo.tgz hugo vault --version consul --version + hugo version make test + (cd docs && hugo --verbose --renderToMemory) + # clean removes intermediate files clean: @@ -126,4 +132,4 @@ clean: rm -rf pkg dist fabio find . -name '*.test' -delete -.PHONY: all build clean codeship gofmt gorelease help homebrew install linux pkg preflight release tag test +.PHONY: all build clean travis gofmt gorelease help homebrew install linux pkg preflight release tag test diff --git a/build/homebrew.sh b/build/homebrew.sh index e05090cea..ee392f43b 100755 --- a/build/homebrew.sh +++ b/build/homebrew.sh @@ -19,7 +19,9 @@ v=${v/v/} srcurl=https://github.com/fabiolb/fabio/archive/v${v}.tar.gz shasum=$(wget -O- -q "$srcurl" | shasum -a 256 | awk '{ print $1; }') -echo -e "/url DAurl \"$srcurl\"/sha256 DAsha256 \"$shasum\":wq" > $prgdir/homebrew.vim +echo -e "/url +DAurl \"$srcurl\"/sha256 +DAsha256 \"$shasum\":wq" > $prgdir/homebrew.vim brew update brew update @@ -33,10 +35,10 @@ brew update brew audit --strict fabio git add Formula/fabio.rb git commit -m "fabio $v" - git push --set-upstream magiconair fabio-$v + git push --set-upstream fabiolb fabio-$v ) -echo "Goto https://github.com/magiconair/homebrew-core to create pull request" -open https://github.com/magiconair/homebrew-core +echo "Goto https://github.com/fabiolb/homebrew-core to create pull request" +open https://github.com/fabiolb/homebrew-core exit 0 diff --git a/docs/layouts/404.html b/docs/layouts/404.html new file mode 100644 index 000000000..fa5f0060f --- /dev/null +++ b/docs/layouts/404.html @@ -0,0 +1,15 @@ +{{partial "header" .}} + +
+
+ {{partial "sidebar" .}} + +
+
+ +{{partial "footer" .}} diff --git a/docs/layouts/partials/footer.html b/docs/layouts/partials/footer.html index c1715185b..e2a7cc3f8 100644 --- a/docs/layouts/partials/footer.html +++ b/docs/layouts/partials/footer.html @@ -6,8 +6,9 @@

- Copyright © 2006 - 2020 Frank Schröder. All right reserved.
- Copyright © 2020 - {{ now.Format "2006" }} Education Networks of America. All right reserved.
+ Copyright © 2020-{{ now.Format "2006" }} Education Networks of America. All rights reserved.
+ Copyright © 2017-2020 Frank Schröder. All rights reserved.
+ Copyright © 2015-2017 eBay Software Foundation. All rights reserved
Last updated on {{ now.Format "2 Jan 2006 15:04"}}

diff --git a/main.go b/main.go index b417ebe35..408515a5e 100644 --- a/main.go +++ b/main.go @@ -618,4 +618,4 @@ func tableSchemes(r route.Routes) []string { } } return unique(schemes) -} \ No newline at end of file +}