From d4fd82f2fadf228db141e1525fc6a43fbd4dbbc5 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 15 Sep 2019 10:20:44 +0800 Subject: [PATCH 1/4] makefile for go mod --- Makefile | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index e9489d9..af157fd 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,3 @@ -IMPORT := code.gitea.io/sdk - -PACKAGES ?= $(shell go list -e ./... | grep -v /vendor/ | grep -v /benchmark/) -GENERATE ?= code.gitea.io/sdk/gitea - .PHONY: all all: clean test build @@ -10,36 +5,29 @@ all: clean test build clean: go clean -i ./... -generate: - @which mockery > /dev/null; if [ $$? -ne 0 ]; then \ - go get -u github.com/vektra/mockery/...; \ - fi - go generate $(GENERATE) - .PHONY: fmt fmt: find . -name "*.go" -type f ! -path "./vendor/*" ! -path "./benchmark/*" | xargs gofmt -s -w .PHONY: vet vet: - go get code.gitea.io/gitea/modules/structs - go vet $(PACKAGES) + cd gitea && go vet ./... .PHONY: lint lint: @which golint > /dev/null; if [ $$? -ne 0 ]; then \ go get -u golang.org/x/lint/golint; \ fi - for PKG in $(PACKAGES); do golint -set_exit_status $$PKG || exit 1; done; + cd gitea && golint -set_exit_status .PHONY: test test: - for PKG in $(PACKAGES); do go test -cover -coverprofile $$GOPATH/src/$$PKG/coverage.out $$PKG || exit 1; done; + cd gitea && go test -cover -coverprofile coverage.out .PHONY: bench bench: - go test -run=XXXXXX -benchtime=10s -bench=. || exit 1 + cd gitea && go test -run=XXXXXX -benchtime=10s -bench=. || exit 1 .PHONY: build build: - go build ./gitea + cd gitea && GO111MODULE=on go build -- 2.40.1 From 38179fcb8cd4dc62ac04de2cf589263cd2ae77c8 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 15 Sep 2019 10:24:16 +0800 Subject: [PATCH 2/4] fix makefile --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index af157fd..3eb3abc 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ fmt: .PHONY: vet vet: + go get code.gitea.io/gitea/modules/structs cd gitea && go vet ./... .PHONY: lint -- 2.40.1 From 92622fc13cccb3180e7893fb2df61b576925128c Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 15 Sep 2019 10:40:57 +0800 Subject: [PATCH 3/4] convert drone format && add goproxy --- .drone.yml | 69 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 25 deletions(-) diff --git a/.drone.yml b/.drone.yml index 677e597..159e4b6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,34 +1,53 @@ +--- +kind: pipeline +name: default + +platform: + os: linux + arch: amd64 + +clone: + disable: true + workspace: base: /go path: src/code.gitea.io/sdk -clone: - git: - image: plugins/git:next +steps: +- name: git + pull: default + image: plugins/git:next + settings: depth: 50 tags: true -pipeline: - testing: - image: golang:1.12 - pull: true - commands: - - make clean - - make vet - - make lint - - make test - - make build +- name: testing + pull: always + image: golang:1.12 + environment: + GOPROXY: https://goproxy.cn + commands: + - make clean + - make vet + - make lint + - make test + - make build - # coverage: - # image: plugins/coverage:1 - # pull: true - # secrets: [ github_token ] - # server: https://coverage.gitea.io +- name: discord + pull: always + image: appleboy/drone-discord:1.0.0 + environment: + DISCORD_WEBHOOK_ID: + from_secret: discord_webhook_id + DISCORD_WEBHOOK_TOKEN: + from_secret: discord_webhook_token + when: + event: + - push + - tag + - pull_request + status: + - changed + - failure - discord: - image: appleboy/drone-discord:1.0.0 - pull: true - secrets: [ discord_webhook_id, discord_webhook_token ] - when: - event: [ push, tag, pull_request ] - status: [ changed, failure ] +... -- 2.40.1 From f53d5f92baa5955802167ebac027791b5ac12c1a Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 15 Sep 2019 16:22:28 +0800 Subject: [PATCH 4/4] use go1.13 on test --- .drone.yml | 6 ++---- Makefile | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 159e4b6..3a3126b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,7 +23,7 @@ steps: - name: testing pull: always - image: golang:1.12 + image: golang:1.13 environment: GOPROXY: https://goproxy.cn commands: @@ -48,6 +48,4 @@ steps: - pull_request status: - changed - - failure - -... + - failure \ No newline at end of file diff --git a/Makefile b/Makefile index 3eb3abc..4c06e8e 100644 --- a/Makefile +++ b/Makefile @@ -31,4 +31,4 @@ bench: .PHONY: build build: - cd gitea && GO111MODULE=on go build + cd gitea && go build -- 2.40.1