aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.drone.yml19
-rw-r--r--Makefile5
2 files changed, 7 insertions, 17 deletions
diff --git a/.drone.yml b/.drone.yml
index 0bb731d18d..9824214bcd 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -447,23 +447,13 @@ steps:
commands:
- git fetch --tags --force
- - name: static-windows
- pull: always
- image: techknowlogick/xgo:go-1.14.x
- commands:
- - apt update && apt -y install curl
- - curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt -y install nodejs
- - export PATH=$PATH:$GOPATH/bin
- - make frontend generate release-windows
- environment:
- GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not
- TAGS: bindata sqlite sqlite_unlock_notify
-
- name: static
pull: always
image: techknowlogick/xgo:go-1.15.x
commands:
- - make release-linux release-darwin release-copy release-compress release-sources release-docs release-check
+ - curl -sL https://deb.nodesource.com/setup_14.x | bash - && apt -y install nodejs
+ - export PATH=$PATH:$GOPATH/bin
+ - make release
environment:
GOPROXY: https://goproxy.cn # proxy.golang.org is blocked in China, this proxy is not
TAGS: bindata sqlite sqlite_unlock_notify
@@ -558,8 +548,7 @@ steps:
pull: always
image: techknowlogick/xgo:go-1.15.x
commands:
- - apt update && apt -y install curl
- - curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt -y install nodejs
+ - curl -sL https://deb.nodesource.com/setup_14.x | bash - && apt -y install nodejs
- export PATH=$PATH:$GOPATH/bin
- make release
environment:
diff --git a/Makefile b/Makefile
index d0c1fdabfa..bfeccf82e0 100644
--- a/Makefile
+++ b/Makefile
@@ -42,8 +42,10 @@ ifeq ($(HAS_GO), GO)
endif
ifeq ($(OS), Windows_NT)
+ GOFLAGS := -v -buildmode=exe
EXECUTABLE ?= gitea.exe
else
+ GOFLAGS := -v
EXECUTABLE ?= gitea
endif
@@ -55,7 +57,6 @@ endif
GOFMT ?= gofmt -s
-GOFLAGS := -v
EXTRA_GOFLAGS ?=
MAKE_VERSION := $(shell $(MAKE) -v | head -n 1)
@@ -556,7 +557,7 @@ release-windows: | $(DIST_DIRS)
GO111MODULE=off $(GO) get -u src.techknowlogick.com/xgo; \
fi
@echo "Warning: windows version is built using golang 1.14"
- CGO_CFLAGS="$(CGO_CFLAGS)" GO111MODULE=off xgo -go go-1.14.x -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out gitea-$(VERSION) .
+ CGO_CFLAGS="$(CGO_CFLAGS)" GO111MODULE=off xgo -go $(XGO_VERSION) -buildmode exe -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out gitea-$(VERSION) .
ifeq ($(CI),drone)
cp /build/* $(DIST)/binaries
endif