Browse Source

Update fix grafana and gitea builds

master 0.4.2
Andreas Linz 1 year ago
parent
commit
22469a4552
Signed by: alinz GPG Key ID: 9BF39809C9DA580C
3 changed files with 17 additions and 4 deletions
  1. +2
    -2
      build/gitea/Makefile
  2. +2
    -2
      build/grafana/Makefile
  3. +13
    -0
      build/grafana/mod.patch

+ 2
- 2
build/gitea/Makefile View File

@ -9,7 +9,7 @@ all: gitea
gitea: $(GITEA_SRC) checkout-version $(GOPATH) $(GOPATH)/bin/go-bindata
cd $(GOPATH)/src/code.gitea.io/gitea\
&& PATH=$(GOPATH)/bin:$$PATH TAGS=$(GITEA_BUILD_TAGS) make generate build
&& PATH=$(GOPATH)/bin:$$PATH TAGS=$(GITEA_BUILD_TAGS) make GO111MODULE=on generate build
cp $(GITEA_SRC)/$@ $@
$(GOPATH): $(GITEA_SRC)
@ -17,7 +17,7 @@ $(GOPATH): $(GITEA_SRC)
ln -sf $(shell pwd)/$(GITEA_SRC) $(GOPATH)/src/code.gitea.io/gitea
$(GOPATH)/bin/go-bindata: $(GOPATH)
go get github.com/go-bindata/go-bindata/go-bindata
GO111MODULE=on go get -u github.com/go-bindata/go-bindata/go-bindata
$(GITEA_SRC):
git clone https://github.com/go-gitea/gitea.git $@

+ 2
- 2
build/grafana/Makefile View File

@ -1,12 +1,12 @@
.PHONY: grafana clean
VERSION :=v6.3.2
VERSION :=v6.4.3
GRAFANA_SRC :=grafana-src-$(VERSION)
all: grafana
grafana: $(GRAFANA_SRC) checkout-version
cd $(GRAFANA_SRC) && go run build.go build
cd $(GRAFANA_SRC) && git apply ../mod.patch && make build-server
mkdir -p $@
cp -r $(GRAFANA_SRC)/bin/linux-amd64 $@/bin
cp -r $(GRAFANA_SRC)/conf $@/

+ 13
- 0
build/grafana/mod.patch View File

@ -0,0 +1,13 @@
diff --git a/go.mod b/go.mod
index 1c90cfe4fa..3223ff3b27 100644
--- a/go.mod
+++ b/go.mod
@@ -72,7 +72,7 @@ require (
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914
golang.org/x/sync v0.0.0-20190423024810-112230192c58
- golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373
+ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
gopkg.in/ini.v1 v1.46.0

Loading…
Cancel
Save