From 8dc8c74a82182a0a495d329acdc95900d27c0779 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Sun, 16 Apr 2017 09:44:42 +0100 Subject: [PATCH] remove revisioning from footer\ revisioning on footer was wrong because it would always have one revision less. From now on, it is the user's responsability to know when he have downloaded caddy (if downloaded from caddyserver.com) OR to know which revision he is in (if he built from source). Former-commit-id: 3caf6557179540c0b0dba95cc3447e8d8de71b2b [formerly 1d878f86fe5c350c773e6deb596f9076b5b45cf1] [formerly c44ea4ec663c2cfaa37add9e998a80fc95ceb4dc [formerly 7f95e5e6de39840c8297226f7877827b06d622b2]] Former-commit-id: eca27467cca6a26b284e3b963c1c6f15855c91e5 [formerly dba45db41f9eb5956fc00862b3e64d3d0be16c15] Former-commit-id: 98e144c2aee7366559e8f08e7cedf7982ab5d432 --- _embed/templates/base.tmpl | 2 +- assets/binary.go.REMOVED.git-id | 2 +- page/page.go | 5 ----- page/version.go | 5 ----- pre-build.sh | 2 -- 5 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 page/version.go diff --git a/_embed/templates/base.tmpl b/_embed/templates/base.tmpl index 01c28bac..7a96c146 100644 --- a/_embed/templates/base.tmpl +++ b/_embed/templates/base.tmpl @@ -264,6 +264,6 @@ - + diff --git a/assets/binary.go.REMOVED.git-id b/assets/binary.go.REMOVED.git-id index e321474a..8c7b402e 100644 --- a/assets/binary.go.REMOVED.git-id +++ b/assets/binary.go.REMOVED.git-id @@ -1 +1 @@ -4c7f54809aade704e88ae32c81a1287cdbe7c7dc \ No newline at end of file +75422c223db54a8cbea454f33339c9b40d0e1dae \ No newline at end of file diff --git a/page/page.go b/page/page.go index d3653c7d..fd53f207 100644 --- a/page/page.go +++ b/page/page.go @@ -34,11 +34,6 @@ type Info struct { Token string } -// Commit returns the current build commit -func (i *Info) Commit() string { - return GIT_COMMIT_HASH -} - // BreadcrumbMapItem ... type BreadcrumbMapItem struct { Name string diff --git a/page/version.go b/page/version.go deleted file mode 100644 index 1d77eccc..00000000 --- a/page/version.go +++ /dev/null @@ -1,5 +0,0 @@ -package page - -var GIT_COMMIT_HASH = "2640977" -var CIRCLE_BUILD_NUM = "" -var GENERATED int64 = 1492331950511420300 diff --git a/pre-build.sh b/pre-build.sh index 35f74e4e..a3d579dd 100644 --- a/pre-build.sh +++ b/pre-build.sh @@ -1,11 +1,9 @@ #!/bin/sh go get github.com/jteeuwen/go-bindata/go-bindata -go get github.com/bountylabs/gitversion go-bindata -pkg assets -prefix "_embed" \ -o assets/binary.go -ignore "^.*theme-([^g]|g[^i]|gi[^t]|git[^h]|gith[^u]|githu[^b]).*\.js$" \ _embed/templates/... _embed/public/js/... _embed/public/css/... _embed/public/ace/src-min/... -gitversion -s -o page/version.go -p page git add -A