From 6aa4629f05a88413c9c7ce9f6b721e198f0f2069 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 26 Apr 2019 11:41:21 +0800 Subject: [PATCH] fix drone (#21) * fix drone * remove docker on drone --- .drone.yml | 31 ------------------------------- Makefile | 20 +++++++++----------- 2 files changed, 9 insertions(+), 42 deletions(-) diff --git a/.drone.yml b/.drone.yml index 60e170c..6db2aab 100644 --- a/.drone.yml +++ b/.drone.yml @@ -81,37 +81,6 @@ pipeline: when: event: [ push, tag ] - - docker-dryrun: - image: plugins/docker:17.12 - pull: true - repo: gitea/tea - cache_from: gitea/tea - dry_run: true - when: - event: [ pull_request ] - - release-docker: - image: plugins/docker:17.12 - pull: true - secrets: [ docker_username, docker_password ] - repo: gitea/tea - tags: [ '${DRONE_BRANCH##release/v}' ] - cache_from: gitea/tea - when: - event: [ push ] - branch: [ release/* ] - - docker: - image: plugins/docker:17.12 - secrets: [ docker_username, docker_password ] - pull: true - repo: gitea/tea - cache_from: gitea/tea - default_tags: true - when: - event: [ push, tag ] - gpg-sign: image: plugins/gpgsign:1 pull: true diff --git a/Makefile b/Makefile index 69d6a88..6ec9f86 100644 --- a/Makefile +++ b/Makefile @@ -28,25 +28,23 @@ MAKE_VERSION := $(shell make -v | head -n 1) ifneq ($(DRONE_TAG),) VERSION ?= $(subst v,,$(DRONE_TAG)) - GITEA_VERSION ?= $(VERSION) + TEA_VERSION ?= $(VERSION) else ifneq ($(DRONE_BRANCH),) VERSION ?= $(subst release/v,,$(DRONE_BRANCH)) else VERSION ?= master endif - GITEA_VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//') + TEA_VERSION ?= $(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//') endif -LDFLAGS := -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(GITEA_VERSION)" -X "main.Tags=$(TAGS)" +LDFLAGS := -X "main.Version=$(TEA_VERSION)" -X "main.Tags=$(TAGS)" -PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations/migration-test,$(filter-out code.gitea.io/gitea/integrations,$(shell $(GO) list ./... | grep -v /vendor/))) +PACKAGES ?= $(shell $(GO) list ./... | grep -v /vendor/) SOURCES ?= $(shell find . -name "*.go" -type f) TAGS ?= -TMPDIR := $(shell mktemp -d 2>/dev/null || mktemp -d -t 'gitea-temp') - ifeq ($(OS), Windows_NT) EXECUTABLE := tea.exe else @@ -62,7 +60,7 @@ all: build .PHONY: clean clean: $(GO) clean -i ./... - rm -rf $(EXECUTABLE) $(DIST) $(BINDATA) + rm -rf $(EXECUTABLE) $(DIST) .PHONY: fmt fmt: @@ -119,7 +117,7 @@ coverage: @hash gocovmerge > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ $(GO) get -u github.com/wadey/gocovmerge; \ fi - gocovmerge integration.coverage.out $(shell find . -type f -name "coverage.out") > coverage.all;\ + gocovmerge $(shell find . -type f -name "coverage.out") > coverage.all;\ .PHONY: unit-test-coverage unit-test-coverage: @@ -163,7 +161,7 @@ release-windows: @hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ $(GO) get -u src.techknowlogick.com/xgo; \ fi - xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out gitea-$(VERSION) . + xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'windows/*' -out tea-$(VERSION) . ifeq ($(CI),drone) cp /build/* $(DIST)/binaries endif @@ -173,7 +171,7 @@ release-linux: @hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ $(GO) get -u src.techknowlogick.com/xgo; \ fi - xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'linux/*' -out gitea-$(VERSION) . + xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -targets 'linux/*' -out tea-$(VERSION) . ifeq ($(CI),drone) cp /build/* $(DIST)/binaries endif @@ -183,7 +181,7 @@ release-darwin: @hash xgo > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ $(GO) get -u src.techknowlogick.com/xgo; \ fi - xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out gitea-$(VERSION) . + xgo -dest $(DIST)/binaries -tags 'netgo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'darwin/*' -out tea-$(VERSION) . ifeq ($(CI),drone) cp /build/* $(DIST)/binaries endif