From a43224ec8576a259caa096e9221dadea983ea740 Mon Sep 17 00:00:00 2001 From: aichy Date: Fri, 16 Dec 2022 17:08:56 +0800 Subject: [PATCH 1/6] update goreleaser --- .goreleaser.yaml | 51 +++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 42d62f49..bec98c98 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -1,20 +1,45 @@ -# This is an example .goreleaser.yml file with some sensible defaults. -# Make sure to check the documentation at https://goreleaser.com before: hooks: - # You may remove this if you don't use go modules. - go mod tidy builds: - - env: - - CGO_ENABLED=1 + - id: build-linux + main: ./cmd/answer/. + binary: PrometheusAlert + ldflags: -s -w -X main.Version=${{.Version}} -X main.Revision={{.ShortCommit}} -X main.BuildDate={{.Date}} -X main.BuildUser=goreleaser + goos: + - darwin + - linux + goarch: + - amd64 + # linux windows need cgomingw64-gcc + - id: build-windows + main: ./cmd/answer/. + binary: PrometheusAlert + ldflags: -s -w -X main.Version=${{.Version}} -X main.Revision={{.ShortCommit}} -X main.BuildDate={{.Date}} -X main.BuildUser=goreleaser + env: + - CC=x86_64-w64-mingw32-gcc + - CXX=x86_64-w64-mingw32-g++ + goos: + - windows + goarch: + - amd64 + # linux arm64 need cgo arm64 + - id: build-arm + main: ./cmd/answer/. + binary: PrometheusAlert + ldflags: -s -w -X main.Version=${{.Version}} -X main.Revision={{.ShortCommit}} -X main.BuildDate={{.Date}} -X main.BuildUser=goreleaser + env: - CC=aarch64-linux-gnu-gcc - CXX=aarch64-linux-gnu-g++ - main: ./cmd/answer/. goos: + - darwin - linux + goarch: + - arm64 + archives: - replacements: - linux: Linux + darwin: Darwin amd64: x86_64 checksum: name_template: 'checksums.txt' @@ -25,14 +50,4 @@ changelog: filters: exclude: - '^docs:' - - '^test:' - -# modelines, feel free to remove those if you don't want/use them: -# yaml-language-server: $schema=https://goreleaser.com/static/schema.json -# vim: set ts=2 sw=2 tw=0 fo=cnqoj -# sqlite3 need cgo to build -# sudo apt-get install build-essential -# sudo apt-get install gcc-multilib g++-multilib -# sudo apt-get install gcc-mingw-w64 -# sudo apt-get -y install gcc-aarch64-linux-gnu -# goreleaser release --snapshot --rm-dist + - '^test:' \ No newline at end of file From 2380d4c4c87afe394ea34041b03e1d1040fce797 Mon Sep 17 00:00:00 2001 From: aichy Date: Fri, 16 Dec 2022 17:16:27 +0800 Subject: [PATCH 2/6] update goreleaser --- .goreleaser.yaml | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index bec98c98..5e29a012 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -2,9 +2,9 @@ before: hooks: - go mod tidy builds: - - id: build-linux + - id: build-amd64 main: ./cmd/answer/. - binary: PrometheusAlert + binary: answer ldflags: -s -w -X main.Version=${{.Version}} -X main.Revision={{.ShortCommit}} -X main.BuildDate={{.Date}} -X main.BuildUser=goreleaser goos: - darwin @@ -14,7 +14,7 @@ builds: # linux windows need cgomingw64-gcc - id: build-windows main: ./cmd/answer/. - binary: PrometheusAlert + binary: answer ldflags: -s -w -X main.Version=${{.Version}} -X main.Revision={{.ShortCommit}} -X main.BuildDate={{.Date}} -X main.BuildUser=goreleaser env: - CC=x86_64-w64-mingw32-gcc @@ -24,9 +24,9 @@ builds: goarch: - amd64 # linux arm64 need cgo arm64 - - id: build-arm + - id: build-arm64 main: ./cmd/answer/. - binary: PrometheusAlert + binary: answer ldflags: -s -w -X main.Version=${{.Version}} -X main.Revision={{.ShortCommit}} -X main.BuildDate={{.Date}} -X main.BuildUser=goreleaser env: - CC=aarch64-linux-gnu-gcc @@ -50,4 +50,11 @@ changelog: filters: exclude: - '^docs:' - - '^test:' \ No newline at end of file + - '^test:' + + +# sudo apt-get install build-essential +# sudo apt-get install gcc-multilib g++-multilib +# sudo apt-get install gcc-mingw-w64 +# sudo apt-get -y install gcc-aarch64-linux-gnu +# goreleaser release --snapshot --rm-dist \ No newline at end of file From 69de818d770b6d80a4319dbf810fbfea5fe91692 Mon Sep 17 00:00:00 2001 From: aichy Date: Fri, 16 Dec 2022 17:27:41 +0800 Subject: [PATCH 3/6] update goreleaser --- .goreleaser.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 5e29a012..e5d7a28a 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -5,7 +5,7 @@ builds: - id: build-amd64 main: ./cmd/answer/. binary: answer - ldflags: -s -w -X main.Version=${{.Version}} -X main.Revision={{.ShortCommit}} -X main.BuildDate={{.Date}} -X main.BuildUser=goreleaser + ldflags: -s -w -X main.Version={{.Version}} -X main.Revision={{.ShortCommit}} -X main.Time={{.Date}} -X main.BuildUser=goreleaser goos: - darwin - linux @@ -15,7 +15,7 @@ builds: - id: build-windows main: ./cmd/answer/. binary: answer - ldflags: -s -w -X main.Version=${{.Version}} -X main.Revision={{.ShortCommit}} -X main.BuildDate={{.Date}} -X main.BuildUser=goreleaser + ldflags: -s -w -X main.Version={{.Version}} -X main.Revision={{.ShortCommit}} -X main.Time={{.Date}} -X main.BuildUser=goreleaser env: - CC=x86_64-w64-mingw32-gcc - CXX=x86_64-w64-mingw32-g++ @@ -27,7 +27,7 @@ builds: - id: build-arm64 main: ./cmd/answer/. binary: answer - ldflags: -s -w -X main.Version=${{.Version}} -X main.Revision={{.ShortCommit}} -X main.BuildDate={{.Date}} -X main.BuildUser=goreleaser + ldflags: -s -w -X main.Version={{.Version}} -X main.Revision={{.ShortCommit}} -X main.Time={{.Date}} -X main.BuildUser=goreleaser env: - CC=aarch64-linux-gnu-gcc - CXX=aarch64-linux-gnu-g++ From 6e38c58f982611e5f88f14966b9f0c9dcfb10b04 Mon Sep 17 00:00:00 2001 From: aichy Date: Fri, 16 Dec 2022 18:41:07 +0800 Subject: [PATCH 4/6] update --- .goreleaser.yaml | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index e5d7a28a..a8343095 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -1,3 +1,9 @@ +env: + - GO11MODULE=on + - GO111MODULE=on + - GOPROXY=https://goproxy.io + - CGO_ENABLED=1 + before: hooks: - go mod tidy @@ -7,7 +13,6 @@ builds: binary: answer ldflags: -s -w -X main.Version={{.Version}} -X main.Revision={{.ShortCommit}} -X main.Time={{.Date}} -X main.BuildUser=goreleaser goos: - - darwin - linux goarch: - amd64 @@ -32,10 +37,28 @@ builds: - CC=aarch64-linux-gnu-gcc - CXX=aarch64-linux-gnu-g++ goos: - - darwin - linux goarch: - arm64 + # - id: darwin-arm64 + # main: ./cmd/answer/. + # binary: answer + # goos: + # - darwin + # goarch: + # - arm64 + # ldflags: -s -w -X main.Version={{.Version}} -X main.Revision={{.ShortCommit}} -X main.Time={{.Date}} -X main.BuildUser=goreleaser -extldflags "-static" + # flags: -v + # - id: darwin-amd64 + # main: ./cmd/answer/. + # binary: answer + # goos: + # - darwin + # goarch: + # - arm64 + # ldflags: -s -w -X main.Version={{.Version}} -X main.Revision={{.ShortCommit}} -X main.Time={{.Date}} -X main.BuildUser=goreleaser -extldflags "-static" + # flags: -v + archives: - replacements: @@ -56,5 +79,6 @@ changelog: # sudo apt-get install build-essential # sudo apt-get install gcc-multilib g++-multilib # sudo apt-get install gcc-mingw-w64 -# sudo apt-get -y install gcc-aarch64-linux-gnu +# sudo apt-get -y install gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf +# sudo apt-get install clang llvm # goreleaser release --snapshot --rm-dist \ No newline at end of file From 706b73173faa6ed6cf19631fb15d071b498f0428 Mon Sep 17 00:00:00 2001 From: aichy Date: Fri, 16 Dec 2022 19:26:32 +0800 Subject: [PATCH 5/6] update .goreleaser --- .goreleaser.yaml | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index a8343095..ae7edac9 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -40,23 +40,36 @@ builds: - linux goarch: - arm64 - # - id: darwin-arm64 + # - id: darwin # main: ./cmd/answer/. # binary: answer # goos: # - darwin + # ldflags: -s -w -X main.Version={{.Version}} -X main.Revision={{.ShortCommit}} -X main.Time={{.Date}} -X main.BuildUser=goreleaser + #todo + # - id: darwin-arm64 + # main: ./cmd/answer/. + # binary: answer + # env: + # - CC=oa64-clang + # - CXX=oa64-clang++ + # goos: + # - darwin # goarch: # - arm64 - # ldflags: -s -w -X main.Version={{.Version}} -X main.Revision={{.ShortCommit}} -X main.Time={{.Date}} -X main.BuildUser=goreleaser -extldflags "-static" + # ldflags: -s -w -X main.Version={{.Version}} -X main.Revision={{.ShortCommit}} -X main.Time={{.Date}} -X main.BuildUser=goreleaser # flags: -v # - id: darwin-amd64 # main: ./cmd/answer/. # binary: answer + # env: + # - CC=o64-clang + # - CXX=o64-clang++ # goos: # - darwin # goarch: - # - arm64 - # ldflags: -s -w -X main.Version={{.Version}} -X main.Revision={{.ShortCommit}} -X main.Time={{.Date}} -X main.BuildUser=goreleaser -extldflags "-static" + # - amd64 + # ldflags: -s -w -X main.Version={{.Version}} -X main.Revision={{.ShortCommit}} -X main.Time={{.Date}} -X main.BuildUser=goreleaser # flags: -v From fc5b65ee0e6abae19cc0407b03a007a6ec50b4d1 Mon Sep 17 00:00:00 2001 From: aichy126 <16996097+aichy126@users.noreply.github.com> Date: Fri, 16 Dec 2022 19:38:55 +0800 Subject: [PATCH 6/6] add icon --- internal/controller/template_controller.go | 1 - ui/template/header.html | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/internal/controller/template_controller.go b/internal/controller/template_controller.go index 801312cf..e5267971 100644 --- a/internal/controller/template_controller.go +++ b/internal/controller/template_controller.go @@ -426,7 +426,6 @@ func (tc *TemplateController) html(ctx *gin.Context, code int, tpl string, siteI if !ok { data["path"] = "" } - ctx.HTML(code, tpl, data) } diff --git a/ui/template/header.html b/ui/template/header.html index 0780ba29..ebb59788 100644 --- a/ui/template/header.html +++ b/ui/template/header.html @@ -12,8 +12,14 @@ - + + + {{if $.siteinfo.JsonLD }}{{ .siteinfo.JsonLD | templateHTML}}{{end}} + + + +