From be4f6a754cc1ba93f92c06c28be21d77b79f5fe9 Mon Sep 17 00:00:00 2001
From: Bo-Yi Wu <appleboy.tw@gmail.com>
Date: Tue, 22 Aug 2017 20:56:57 -0500
Subject: [PATCH] Revert "Changes for latest DroneCI (#2355)" (#2358)

This reverts commit faf4b503b24d33a2a0f455d26bb782345ab8e0c9.
---
 .drone.yml | 64 +++++++++++++++++++++---------------------------------
 Makefile   |  4 ++--
 2 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 08fbf05f19..156cf95f5e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,13 +2,12 @@ workspace:
   base: /srv/app
   path: src/code.gitea.io/gitea
 
-clone:
-  git:
-    image: plugins/git:latest
+pipeline:
+  clone:
+    image: plugins/git
     depth: 50
     tags: true
 
-pipeline:
   build:
     image: webhippie/golang:edge
     pull: true
@@ -16,6 +15,7 @@ pipeline:
       TAGS: bindata sqlite
       GOPATH: /srv/app
     commands:
+      - apk -U add openssh-client
       - make clean
       - make generate
       - make vet
@@ -30,32 +30,32 @@ pipeline:
   test:
     image: webhippie/golang:edge
     pull: true
-    group: test
     environment:
       TAGS: bindata sqlite
       GOPATH: /srv/app
     commands:
+      - apk -U add openssh-client
       - make test
     when:
-      event: [ pull_request ]
+      event: [ tag, pull_request ]
 
-  coverage:
+  test-coverage:
     image: webhippie/golang:edge
     pull: true
-    group: test
     environment:
       TAGS: bindata sqlite
       GOPATH: /srv/app
     commands:
-      - make coverage
+      - apk -U add openssh-client
+      - go get github.com/wadey/gocovmerge
+      - make test-coverage
     when:
-      event: [ push, tag ]
+      event: [ push ]
       branch: master
 
   test-sqlite:
     image: webhippie/golang:edge
     pull: true
-    group: test
     environment:
       TAGS: bindata
       GOPATH: /srv/app
@@ -67,7 +67,6 @@ pipeline:
   test-mysql:
     image: webhippie/golang:edge
     pull: true
-    group: test
     environment:
       TAGS: bindata
       GOPATH: /srv/app
@@ -79,7 +78,6 @@ pipeline:
   test-pgsql:
     image: webhippie/golang:edge
     pull: true
-    group: test
     environment:
       TAGS: bindata
       GOPATH: /srv/app
@@ -100,15 +98,15 @@ pipeline:
       event: [ push, tag ]
 
   # coverage:
-  #   image: plugins/coverage:latest
-  #   pull: true
-  #   secrets: [ github_token ]
+  #   image: plugins/coverage
   #   server: https://coverage.gitea.io
+  #   when:
+  #     event: [ push ]
+  #     branch: master
 
   docker:
-    image: plugins/docker:latest
+    image: plugins/docker
     pull: true
-    secrets: [ docker_username, docker_password ]
     repo: gitea/gitea
     tags: [ '${DRONE_TAG##v}' ]
     when:
@@ -116,9 +114,8 @@ pipeline:
       branch: [ refs/tags/* ]
 
   docker:
-    image: plugins/docker:latest
+    image: plugins/docker
     pull: true
-    secrets: [ docker_username, docker_password ]
     repo: gitea/gitea
     tags: [ '${DRONE_BRANCH##release/v}' ]
     when:
@@ -126,9 +123,8 @@ pipeline:
       branch: [ release/* ]
 
   docker:
-    image: plugins/docker:latest
+    image: plugins/docker
     pull: true
-    secrets: [ docker_username, docker_password ]
     repo: gitea/gitea
     tags: [ 'latest' ]
     when:
@@ -136,10 +132,7 @@ pipeline:
       branch: [ master ]
 
   release:
-    image: plugins/s3:latest
-    pull: true
-    secrets: [ s3_access_key, s3_secret_key ]
-    endpoint: https://storage.gitea.io
+    image: plugins/s3
     path_style: true
     strip_prefix: dist/release/
     source: dist/release/*
@@ -149,10 +142,7 @@ pipeline:
       branch: [ refs/tags/* ]
 
   release:
-    image: plugins/s3:latest
-    pull: true
-    secrets: [ s3_access_key, s3_secret_key ]
-    endpoint: https://storage.gitea.io
+    image: plugins/s3
     path_style: true
     strip_prefix: dist/release/
     source: dist/release/*
@@ -162,10 +152,7 @@ pipeline:
       branch: [ release/* ]
 
   release:
-    image: plugins/s3:latest
-    pull: true
-    secrets: [ s3_access_key, s3_secret_key ]
-    endpoint: https://storage.gitea.io
+    image: plugins/s3
     path_style: true
     strip_prefix: dist/release/
     source: dist/release/*
@@ -175,8 +162,7 @@ pipeline:
       branch: [ master ]
 
   github:
-    image: plugins/github-release:latest
-    pull: true
+    image: plugins/github-release
     files:
       - dist/release/*
     when:
@@ -184,9 +170,9 @@ pipeline:
       branch: [ refs/tags/* ]
 
   discord:
-    image: appleboy/drone-discord:latest
-    pull: true
-    secrets: [ discord_webhook_id, discord_webhook_token ]
+    image: appleboy/drone-discord:0.0.4
+    webhook_id: ${WEBHOOK_ID}
+    webhook_token: ${WEBHOOK_TOKEN}
     when:
       event: [ push, tag, pull_request ]
       status: [ changed, failure ]
diff --git a/Makefile b/Makefile
index 6feccfb28a..f9863e1e4e 100644
--- a/Makefile
+++ b/Makefile
@@ -125,8 +125,8 @@ fmt-check: required-gofmt-version
 test: fmt-check
 	$(GO) test $(PACKAGES)
 
-.PHONY: coverage
-coverage: unit-test-coverage integration-test-coverage
+.PHONY: test-coverage
+test-coverage: unit-test-coverage integration-test-coverage
 	@hash gocovmerge > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
 		$(GO) get -u github.com/wadey/gocovmerge; \
 	fi