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
fabiolb · Jan 24, 2020 · 2059151 · 2059151
1 parent 4425372
commit 2059151
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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,16 +115,21 @@ 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:
 	go 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
@@ -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 "/urlDAurl \"$srcurl\"/sha256DAsha256 \"$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
@@ -0,0 +1,15 @@
+{{partial "header" .}}
+
+<main class="container">
+    <div class="row">
+        {{partial "sidebar" .}}
+        <article class="col-sm-9 main-content" role="main">
+            <section>
+                <h2>Page Not Found</h2>
+                <a href="{{ "/" | relURL }}">Return Home</a>
+            </section>
+        </article>
+    </div>
+</main>
+
+{{partial "footer" .}}
diff --git a/docs/layouts/partials/footer.html b/docs/layouts/partials/footer.html
@@ -6,8 +6,9 @@
         <div class="row">
           <div class="col-md-6 col-sm-6">
             <p style="line-height: 26px;">
-                Copyright &copy; 2006 - 2020 Frank Schröder. All right reserved.</br>
-                Copyright &copy; 2020 - {{ now.Format "2006" }} Education Networks of America. All right reserved.</br>
+                Copyright &copy; 2020-{{ now.Format "2006" }} Education Networks of America. All rights reserved.</br>
+                Copyright &copy; 2017-2020 Frank Schröder. All rights reserved.</br>
+                Copyright &copy; 2015-2017 eBay Software Foundation.  All rights reserved</br>
                 Last updated on {{ now.Format "2 Jan 2006 15:04"}}
             </p>
           </div>

diff --git a/main.go b/main.go
@@ -618,4 +618,4 @@ func tableSchemes(r route.Routes) []string {
 		}
 	}
 	return unique(schemes)
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -618,4 +618,4 @@ func tableSchemes(r route.Routes) []string { @@
     		}
     	}
     	return unique(schemes)
-    }
+    }