Changes for latest DroneCI (#2362)
This commit is contained in:
		
							parent
							
								
									95c408ffa5
								
							
						
					
					
						commit
						4b8fef143e
					
				
							
								
								
									
										79
									
								
								.drone.yml
								
								
								
								
							
							
						
						
									
										79
									
								
								.drone.yml
								
								
								
								
							|  | @ -2,12 +2,13 @@ workspace: | |||
|   base: /srv/app | ||||
|   path: src/code.gitea.io/gitea | ||||
| 
 | ||||
| pipeline: | ||||
|   clone: | ||||
|     image: plugins/git | ||||
| clone: | ||||
|   git: | ||||
|     image: plugins/git:1 | ||||
|     depth: 50 | ||||
|     tags: true | ||||
| 
 | ||||
| pipeline: | ||||
|   build: | ||||
|     image: webhippie/golang:edge | ||||
|     pull: true | ||||
|  | @ -15,7 +16,6 @@ pipeline: | |||
|       TAGS: bindata sqlite | ||||
|       GOPATH: /srv/app | ||||
|     commands: | ||||
|       - apk -U add openssh-client | ||||
|       - make clean | ||||
|       - make generate | ||||
|       - make vet | ||||
|  | @ -30,43 +30,31 @@ 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 | ||||
|       - make coverage | ||||
|     when: | ||||
|       event: [ tag, pull_request ] | ||||
| 
 | ||||
|   test-coverage: | ||||
|     image: webhippie/golang:edge | ||||
|     pull: true | ||||
|     environment: | ||||
|       TAGS: bindata sqlite | ||||
|       GOPATH: /srv/app | ||||
|     commands: | ||||
|       - apk -U add openssh-client | ||||
|       - go get github.com/wadey/gocovmerge | ||||
|       - make test-coverage | ||||
|     when: | ||||
|       event: [ push ] | ||||
|       branch: master | ||||
|       event: [ push, tag, pull_request ] | ||||
| 
 | ||||
|   test-sqlite: | ||||
|     image: webhippie/golang:edge | ||||
|     pull: true | ||||
|     group: test | ||||
|     environment: | ||||
|       TAGS: bindata | ||||
|       GOPATH: /srv/app | ||||
|     commands: | ||||
|       - echo "Needs to be fixed" # make test-sqlite | ||||
|       - make test-sqlite | ||||
|     when: | ||||
|       event: [ push, tag, pull_request ] | ||||
| 
 | ||||
|   test-mysql: | ||||
|     image: webhippie/golang:edge | ||||
|     pull: true | ||||
|     group: test | ||||
|     environment: | ||||
|       TAGS: bindata | ||||
|       GOPATH: /srv/app | ||||
|  | @ -78,6 +66,7 @@ pipeline: | |||
|   test-pgsql: | ||||
|     image: webhippie/golang:edge | ||||
|     pull: true | ||||
|     group: test | ||||
|     environment: | ||||
|       TAGS: bindata | ||||
|       GOPATH: /srv/app | ||||
|  | @ -86,6 +75,12 @@ pipeline: | |||
|     when: | ||||
|       event: [ push, tag, pull_request ] | ||||
| 
 | ||||
|   # coverage: | ||||
|   #   image: plugins/coverage:latest | ||||
|   #   pull: true | ||||
|   #   secrets: [ github_token ] | ||||
|   #   server: https://coverage.gitea.io | ||||
| 
 | ||||
|   static: | ||||
|     image: karalabe/xgo-latest:latest | ||||
|     pull: true | ||||
|  | @ -97,16 +92,10 @@ pipeline: | |||
|     when: | ||||
|       event: [ push, tag ] | ||||
| 
 | ||||
|   # coverage: | ||||
|   #   image: plugins/coverage | ||||
|   #   server: https://coverage.gitea.io | ||||
|   #   when: | ||||
|   #     event: [ push ] | ||||
|   #     branch: master | ||||
| 
 | ||||
|   docker: | ||||
|     image: plugins/docker | ||||
|     image: plugins/docker:17.05 | ||||
|     pull: true | ||||
|     secrets: [ docker_username, docker_password ] | ||||
|     repo: gitea/gitea | ||||
|     tags: [ '${DRONE_TAG##v}' ] | ||||
|     when: | ||||
|  | @ -114,8 +103,9 @@ pipeline: | |||
|       branch: [ refs/tags/* ] | ||||
| 
 | ||||
|   docker: | ||||
|     image: plugins/docker | ||||
|     image: plugins/docker:17.05 | ||||
|     pull: true | ||||
|     secrets: [ docker_username, docker_password ] | ||||
|     repo: gitea/gitea | ||||
|     tags: [ '${DRONE_BRANCH##release/v}' ] | ||||
|     when: | ||||
|  | @ -123,8 +113,9 @@ pipeline: | |||
|       branch: [ release/* ] | ||||
| 
 | ||||
|   docker: | ||||
|     image: plugins/docker | ||||
|     image: plugins/docker:17.05 | ||||
|     pull: true | ||||
|     secrets: [ docker_username, docker_password ] | ||||
|     repo: gitea/gitea | ||||
|     tags: [ 'latest' ] | ||||
|     when: | ||||
|  | @ -132,7 +123,10 @@ pipeline: | |||
|       branch: [ master ] | ||||
| 
 | ||||
|   release: | ||||
|     image: plugins/s3 | ||||
|     image: plugins/s3:1 | ||||
|     pull: true | ||||
|     secrets: [ s3_access_key, s3_secret_key ] | ||||
|     endpoint: https://storage.gitea.io | ||||
|     path_style: true | ||||
|     strip_prefix: dist/release/ | ||||
|     source: dist/release/* | ||||
|  | @ -142,7 +136,10 @@ pipeline: | |||
|       branch: [ refs/tags/* ] | ||||
| 
 | ||||
|   release: | ||||
|     image: plugins/s3 | ||||
|     image: plugins/s3:1 | ||||
|     pull: true | ||||
|     secrets: [ s3_access_key, s3_secret_key ] | ||||
|     endpoint: https://storage.gitea.io | ||||
|     path_style: true | ||||
|     strip_prefix: dist/release/ | ||||
|     source: dist/release/* | ||||
|  | @ -152,7 +149,10 @@ pipeline: | |||
|       branch: [ release/* ] | ||||
| 
 | ||||
|   release: | ||||
|     image: plugins/s3 | ||||
|     image: plugins/s3:1 | ||||
|     pull: true | ||||
|     secrets: [ s3_access_key, s3_secret_key ] | ||||
|     endpoint: https://storage.gitea.io | ||||
|     path_style: true | ||||
|     strip_prefix: dist/release/ | ||||
|     source: dist/release/* | ||||
|  | @ -162,7 +162,8 @@ pipeline: | |||
|       branch: [ master ] | ||||
| 
 | ||||
|   github: | ||||
|     image: plugins/github-release | ||||
|     image: plugins/github-release:1 | ||||
|     pull: true | ||||
|     files: | ||||
|       - dist/release/* | ||||
|     when: | ||||
|  | @ -170,9 +171,9 @@ pipeline: | |||
|       branch: [ refs/tags/* ] | ||||
| 
 | ||||
|   discord: | ||||
|     image: appleboy/drone-discord:0.0.4 | ||||
|     webhook_id: ${WEBHOOK_ID} | ||||
|     webhook_token: ${WEBHOOK_TOKEN} | ||||
|     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 ] | ||||
|  |  | |||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										4
									
								
								Makefile
								
								
								
								
							
							
						
						
									
										4
									
								
								Makefile
								
								
								
								
							|  | @ -125,8 +125,8 @@ fmt-check: required-gofmt-version | |||
| test: fmt-check | ||||
| 	$(GO) test $(PACKAGES) | ||||
| 
 | ||||
| .PHONY: test-coverage | ||||
| test-coverage: unit-test-coverage integration-test-coverage | ||||
| .PHONY: coverage | ||||
| 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 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue