Skip to content

Commit 1837194

Browse files
lafrikslunny
authored andcommitted
Backport changes for latest drone (#2586)
1 parent 9ca2643 commit 1837194

File tree

1 file changed

+41
-46
lines changed

1 file changed

+41
-46
lines changed

.drone.yml

Lines changed: 41 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ workspace:
22
base: /srv/app
33
path: src/code.gitea.io/gitea
44

5-
pipeline:
6-
clone:
7-
image: plugins/git
5+
clone:
6+
git:
7+
image: plugins/git:1
88
depth: 50
99
tags: true
1010

11+
pipeline:
1112
build:
1213
image: webhippie/golang:edge
1314
pull: true
1415
environment:
1516
TAGS: bindata sqlite
1617
GOPATH: /srv/app
1718
commands:
18-
- apk -U add openssh-client
1919
- make clean
2020
- make generate
2121
- make vet
@@ -34,35 +34,21 @@ pipeline:
3434
TAGS: bindata sqlite
3535
GOPATH: /srv/app
3636
commands:
37-
- apk -U add openssh-client
3837
- make test
3938
when:
4039
event: [ tag, pull_request ]
4140

42-
test-coverage:
43-
image: webhippie/golang:edge
44-
pull: true
45-
environment:
46-
TAGS: bindata sqlite
47-
GOPATH: /srv/app
48-
commands:
49-
- apk -U add openssh-client
50-
- go get github.com/wadey/gocovmerge
51-
- make test-coverage
52-
when:
53-
event: [ push ]
54-
branch: master
55-
56-
test-sqlite:
57-
image: webhippie/golang:edge
58-
pull: true
59-
environment:
60-
TAGS: bindata
61-
GOPATH: /srv/app
62-
commands:
63-
- echo "Needs to be fixed" # make test-sqlite
64-
when:
65-
event: [ push, tag, pull_request ]
41+
# Commented until db locking have been resolved!
42+
# test-sqlite:
43+
# image: webhippie/golang:edge
44+
# pull: true
45+
# environment:
46+
# TAGS: bindata
47+
# GOPATH: /srv/app
48+
# commands:
49+
# - make test-sqlite
50+
# when:
51+
# event: [ push, tag, pull_request ]
6652

6753
test-mysql:
6854
image: webhippie/golang:edge
@@ -97,41 +83,41 @@ pipeline:
9783
when:
9884
event: [ push, tag ]
9985

100-
# coverage:
101-
# image: plugins/coverage
102-
# server: https://coverage.gitea.io
103-
# when:
104-
# event: [ push ]
105-
# branch: master
106-
10786
docker:
108-
image: plugins/docker
87+
image: plugins/docker:17.05
10988
pull: true
89+
secrets: [ docker_username, docker_password ]
11090
repo: gitea/gitea
11191
tags: [ '${DRONE_TAG##v}' ]
11292
when:
11393
event: [ tag ]
11494

11595
docker:
116-
image: plugins/docker
96+
image: plugins/docker:17.05
11797
pull: true
98+
secrets: [ docker_username, docker_password ]
11899
repo: gitea/gitea
119100
tags: [ '${DRONE_BRANCH##release/v}' ]
120101
when:
121102
event: [ push ]
122103
branch: [ release/* ]
123104

124105
docker:
125-
image: plugins/docker
106+
image: plugins/docker:17.05
126107
pull: true
108+
secrets: [ docker_username, docker_password ]
127109
repo: gitea/gitea
128110
tags: [ 'latest' ]
129111
when:
130112
event: [ push ]
131113
branch: [ master ]
132114

133115
release:
134-
image: plugins/s3
116+
image: plugins/s3:1
117+
pull: true
118+
secrets: [ aws_access_key_id, aws_secret_access_key ]
119+
bucket: releases
120+
endpoint: https://storage.gitea.io
135121
path_style: true
136122
strip_prefix: dist/release/
137123
source: dist/release/*
@@ -140,7 +126,11 @@ pipeline:
140126
event: [ tag ]
141127

142128
release:
143-
image: plugins/s3
129+
image: plugins/s3:1
130+
pull: true
131+
secrets: [ aws_access_key_id, aws_secret_access_key ]
132+
bucket: releases
133+
endpoint: https://storage.gitea.io
144134
path_style: true
145135
strip_prefix: dist/release/
146136
source: dist/release/*
@@ -150,7 +140,11 @@ pipeline:
150140
branch: [ release/* ]
151141

152142
release:
153-
image: plugins/s3
143+
image: plugins/s3:1
144+
pull: true
145+
secrets: [ aws_access_key_id, aws_secret_access_key ]
146+
bucket: releases
147+
endpoint: https://storage.gitea.io
154148
path_style: true
155149
strip_prefix: dist/release/
156150
source: dist/release/*
@@ -160,16 +154,17 @@ pipeline:
160154
branch: [ master ]
161155

162156
github:
163-
image: plugins/github-release
157+
image: plugins/github-release:1
158+
pull: true
164159
files:
165160
- dist/release/*
166161
when:
167162
event: [ tag ]
168163

169164
discord:
170-
image: appleboy/drone-discord:0.0.4
171-
webhook_id: ${WEBHOOK_ID}
172-
webhook_token: ${WEBHOOK_TOKEN}
165+
image: appleboy/drone-discord:1.0.0
166+
pull: true
167+
secrets: [ discord_webhook_id, discord_webhook_token ]
173168
when:
174169
event: [ push, tag, pull_request ]
175170
status: [ changed, failure ]

0 commit comments

Comments
 (0)