diff options
| author | silverwind <me@silverwind.io> | 2019-12-15 19:06:36 +0100 |
|---|---|---|
| committer | techknowlogick <techknowlogick@gitea.io> | 2019-12-15 13:06:36 -0500 |
| commit | 7217b703e95a3ab01b69f91879fb4d6532f0b2c5 (patch) | |
| tree | 968c647cdf8f7580c6aba91fed52b7f2adec6611 /Makefile | |
| parent | 60b31c8f01cbfdad5435510a9b8b05f84fe38a78 (diff) | |
| download | gitea-7217b703e95a3ab01b69f91879fb4d6532f0b2c5.tar.gz gitea-7217b703e95a3ab01b69f91879fb4d6532f0b2c5.zip | |
Combine Drone release steps (#9338)
* Combine Drone release steps
Fixes missing JS/CSS because drone did unwanted parallelization of the
js/css task and the generate task. Combined the tasks into one and made
'make release' work standalone.
Fixes: https://github.com/go-gitea/gitea/issues/9324
Fixes: https://github.com/go-gitea/gitea/issues/9362
* move js/css to generate dependencies
* remove unneccessary go-all target
* remove go target as well
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -128,7 +128,7 @@ vet: $(GO) vet $(PACKAGES) .PHONY: generate -generate: +generate: js css GO111MODULE=on $(GO) generate -mod=vendor $(PACKAGES) .PHONY: generate-swagger @@ -384,14 +384,8 @@ check: test install: $(wildcard *.go) $(GO) install -v -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -.PHONY: go -go: go-check $(EXECUTABLE) - -.PHONY: go-all -go-all: go-check generate go - .PHONY: build -build: js css go-all +build: go-check generate $(EXECUTABLE) $(EXECUTABLE): $(GO_SOURCES) GO111MODULE=on $(GO) build -mod=vendor $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@ |