Revert "Changes for latest DroneCI (#2355)" (#2358)

This reverts commit faf4b503b2.
This commit is contained in:
Bo-Yi Wu 2017-08-22 20:56:57 -05:00 committed by GitHub
parent 1a5fe4326f
commit be4f6a754c
2 changed files with 27 additions and 41 deletions

View File

@ -2,13 +2,12 @@ workspace:
base: /srv/app base: /srv/app
path: src/code.gitea.io/gitea path: src/code.gitea.io/gitea
clone: pipeline:
git: clone:
image: plugins/git:latest image: plugins/git
depth: 50 depth: 50
tags: true tags: true
pipeline:
build: build:
image: webhippie/golang:edge image: webhippie/golang:edge
pull: true pull: true
@ -16,6 +15,7 @@ pipeline:
TAGS: bindata sqlite TAGS: bindata sqlite
GOPATH: /srv/app GOPATH: /srv/app
commands: commands:
- apk -U add openssh-client
- make clean - make clean
- make generate - make generate
- make vet - make vet
@ -30,32 +30,32 @@ pipeline:
test: test:
image: webhippie/golang:edge image: webhippie/golang:edge
pull: true pull: true
group: test
environment: environment:
TAGS: bindata sqlite TAGS: bindata sqlite
GOPATH: /srv/app GOPATH: /srv/app
commands: commands:
- apk -U add openssh-client
- make test - make test
when: when:
event: [ pull_request ] event: [ tag, pull_request ]
coverage: test-coverage:
image: webhippie/golang:edge image: webhippie/golang:edge
pull: true pull: true
group: test
environment: environment:
TAGS: bindata sqlite TAGS: bindata sqlite
GOPATH: /srv/app GOPATH: /srv/app
commands: commands:
- make coverage - apk -U add openssh-client
- go get github.com/wadey/gocovmerge
- make test-coverage
when: when:
event: [ push, tag ] event: [ push ]
branch: master branch: master
test-sqlite: test-sqlite:
image: webhippie/golang:edge image: webhippie/golang:edge
pull: true pull: true
group: test
environment: environment:
TAGS: bindata TAGS: bindata
GOPATH: /srv/app GOPATH: /srv/app
@ -67,7 +67,6 @@ pipeline:
test-mysql: test-mysql:
image: webhippie/golang:edge image: webhippie/golang:edge
pull: true pull: true
group: test
environment: environment:
TAGS: bindata TAGS: bindata
GOPATH: /srv/app GOPATH: /srv/app
@ -79,7 +78,6 @@ pipeline:
test-pgsql: test-pgsql:
image: webhippie/golang:edge image: webhippie/golang:edge
pull: true pull: true
group: test
environment: environment:
TAGS: bindata TAGS: bindata
GOPATH: /srv/app GOPATH: /srv/app
@ -100,15 +98,15 @@ pipeline:
event: [ push, tag ] event: [ push, tag ]
# coverage: # coverage:
# image: plugins/coverage:latest # image: plugins/coverage
# pull: true
# secrets: [ github_token ]
# server: https://coverage.gitea.io # server: https://coverage.gitea.io
# when:
# event: [ push ]
# branch: master
docker: docker:
image: plugins/docker:latest image: plugins/docker
pull: true pull: true
secrets: [ docker_username, docker_password ]
repo: gitea/gitea repo: gitea/gitea
tags: [ '${DRONE_TAG##v}' ] tags: [ '${DRONE_TAG##v}' ]
when: when:
@ -116,9 +114,8 @@ pipeline:
branch: [ refs/tags/* ] branch: [ refs/tags/* ]
docker: docker:
image: plugins/docker:latest image: plugins/docker
pull: true pull: true
secrets: [ docker_username, docker_password ]
repo: gitea/gitea repo: gitea/gitea
tags: [ '${DRONE_BRANCH##release/v}' ] tags: [ '${DRONE_BRANCH##release/v}' ]
when: when:
@ -126,9 +123,8 @@ pipeline:
branch: [ release/* ] branch: [ release/* ]
docker: docker:
image: plugins/docker:latest image: plugins/docker
pull: true pull: true
secrets: [ docker_username, docker_password ]
repo: gitea/gitea repo: gitea/gitea
tags: [ 'latest' ] tags: [ 'latest' ]
when: when:
@ -136,10 +132,7 @@ pipeline:
branch: [ master ] branch: [ master ]
release: release:
image: plugins/s3:latest image: plugins/s3
pull: true
secrets: [ s3_access_key, s3_secret_key ]
endpoint: https://storage.gitea.io
path_style: true path_style: true
strip_prefix: dist/release/ strip_prefix: dist/release/
source: dist/release/* source: dist/release/*
@ -149,10 +142,7 @@ pipeline:
branch: [ refs/tags/* ] branch: [ refs/tags/* ]
release: release:
image: plugins/s3:latest image: plugins/s3
pull: true
secrets: [ s3_access_key, s3_secret_key ]
endpoint: https://storage.gitea.io
path_style: true path_style: true
strip_prefix: dist/release/ strip_prefix: dist/release/
source: dist/release/* source: dist/release/*
@ -162,10 +152,7 @@ pipeline:
branch: [ release/* ] branch: [ release/* ]
release: release:
image: plugins/s3:latest image: plugins/s3
pull: true
secrets: [ s3_access_key, s3_secret_key ]
endpoint: https://storage.gitea.io
path_style: true path_style: true
strip_prefix: dist/release/ strip_prefix: dist/release/
source: dist/release/* source: dist/release/*
@ -175,8 +162,7 @@ pipeline:
branch: [ master ] branch: [ master ]
github: github:
image: plugins/github-release:latest image: plugins/github-release
pull: true
files: files:
- dist/release/* - dist/release/*
when: when:
@ -184,9 +170,9 @@ pipeline:
branch: [ refs/tags/* ] branch: [ refs/tags/* ]
discord: discord:
image: appleboy/drone-discord:latest image: appleboy/drone-discord:0.0.4
pull: true webhook_id: ${WEBHOOK_ID}
secrets: [ discord_webhook_id, discord_webhook_token ] webhook_token: ${WEBHOOK_TOKEN}
when: when:
event: [ push, tag, pull_request ] event: [ push, tag, pull_request ]
status: [ changed, failure ] status: [ changed, failure ]

View File

@ -125,8 +125,8 @@ fmt-check: required-gofmt-version
test: fmt-check test: fmt-check
$(GO) test $(PACKAGES) $(GO) test $(PACKAGES)
.PHONY: coverage .PHONY: test-coverage
coverage: unit-test-coverage integration-test-coverage test-coverage: unit-test-coverage integration-test-coverage
@hash gocovmerge > /dev/null 2>&1; if [ $$? -ne 0 ]; then \ @hash gocovmerge > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
$(GO) get -u github.com/wadey/gocovmerge; \ $(GO) get -u github.com/wadey/gocovmerge; \
fi fi