Skip to content

Commit 55aefa6

Browse files
tboergertboerger
authored
Merge pull request #24 from 6543-forks/update-gitea-sdk
Update Gitea SDK to v0.13.0
2 parents ca63c2d + b433d42 commit 55aefa6

File tree

6 files changed

+33
-32
lines changed

6 files changed

+33
-32
lines changed

‎.drone.windows.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ platform:
1010
steps:
1111
- name: vet
1212
pull: always
13-
image: golang:1.11-windowsservercore-1803
13+
image: golang:1.13-windowsservercore-1803
1414
commands:
1515
- go vet ./...
1616
environment:
@@ -21,7 +21,7 @@ steps:
2121

2222
- name: test
2323
pull: always
24-
image: golang:1.11-windowsservercore-1803
24+
image: golang:1.13-windowsservercore-1803
2525
commands:
2626
- go test -cover ./...
2727
environment:
@@ -52,7 +52,7 @@ platform:
5252
steps:
5353
- name: build-push
5454
pull: always
55-
image: golang:1.11-windowsservercore-1803
55+
image: golang:1.13-windowsservercore-1803
5656
commands:
5757
- "go build -v -ldflags \"-X main.version=${DRONE_COMMIT_SHA:0:8}\" -a -tags netgo -o release/windows/amd64/drone-gitea-release.exe"
5858
environment:
@@ -65,7 +65,7 @@ steps:
6565

6666
- name: build-tag
6767
pull: always
68-
image: golang:1.11-windowsservercore-1803
68+
image: golang:1.13-windowsservercore-1803
6969
commands:
7070
- "go build -v -ldflags \"-X main.version=${DRONE_TAG##v}\" -a -tags netgo -o release/windows/amd64/drone-gitea-release.exe"
7171
environment:
@@ -77,7 +77,7 @@ steps:
7777

7878
- name: executable
7979
pull: always
80-
image: golang:1.11-windowsservercore-1803
80+
image: golang:1.13-windowsservercore-1803
8181
commands:
8282
- ./release/windows/amd64/drone-gitea-release.exe --help
8383

@@ -148,7 +148,7 @@ platform:
148148
steps:
149149
- name: build-push
150150
pull: always
151-
image: golang:1.11-windowsservercore-1809
151+
image: golang:1.13-windowsservercore-1809
152152
commands:
153153
- "go build -v -ldflags \"-X main.version=${DRONE_COMMIT_SHA:0:8}\" -a -tags netgo -o release/windows/amd64/drone-gitea-release.exe"
154154
environment:
@@ -161,7 +161,7 @@ steps:
161161

162162
- name: build-tag
163163
pull: always
164-
image: golang:1.11-windowsservercore-1809
164+
image: golang:1.13-windowsservercore-1809
165165
commands:
166166
- "go build -v -ldflags \"-X main.version=${DRONE_TAG##v}\" -a -tags netgo -o release/windows/amd64/drone-gitea-release.exe"
167167
environment:
@@ -173,7 +173,7 @@ steps:
173173

174174
- name: executable
175175
pull: always
176-
image: golang:1.11-windowsservercore-1809
176+
image: golang:1.13-windowsservercore-1809
177177
commands:
178178
- ./release/windows/amd64/drone-gitea-release.exe --help
179179

‎.drone.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ platform:
99
steps:
1010
- name: vet
1111
pull: always
12-
image: golang:1.11
12+
image: golang:1.13
1313
commands:
1414
- go vet ./...
1515
environment:
@@ -20,7 +20,7 @@ steps:
2020

2121
- name: test
2222
pull: always
23-
image: golang:1.11
23+
image: golang:1.13
2424
commands:
2525
- go test -cover ./...
2626
environment:
@@ -50,7 +50,7 @@ platform:
5050
steps:
5151
- name: build-push
5252
pull: always
53-
image: golang:1.11
53+
image: golang:1.13
5454
commands:
5555
- "go build -v -ldflags \"-X main.version=${DRONE_COMMIT_SHA:0:8}\" -a -tags netgo -o release/linux/amd64/drone-gitea-release"
5656
environment:
@@ -63,7 +63,7 @@ steps:
6363

6464
- name: build-tag
6565
pull: always
66-
image: golang:1.11
66+
image: golang:1.13
6767
commands:
6868
- "go build -v -ldflags \"-X main.version=${DRONE_TAG##v}\" -a -tags netgo -o release/linux/amd64/drone-gitea-release"
6969
environment:
@@ -75,7 +75,7 @@ steps:
7575

7676
- name: executable
7777
pull: always
78-
image: golang:1.11
78+
image: golang:1.13
7979
commands:
8080
- ./release/linux/amd64/drone-gitea-release --help
8181

@@ -134,7 +134,7 @@ platform:
134134
steps:
135135
- name: build-push
136136
pull: always
137-
image: golang:1.11
137+
image: golang:1.13
138138
commands:
139139
- "go build -v -ldflags \"-X main.version=${DRONE_COMMIT_SHA:0:8}\" -a -tags netgo -o release/linux/arm64/drone-gitea-release"
140140
environment:
@@ -147,7 +147,7 @@ steps:
147147

148148
- name: build-tag
149149
pull: always
150-
image: golang:1.11
150+
image: golang:1.13
151151
commands:
152152
- "go build -v -ldflags \"-X main.version=${DRONE_TAG##v}\" -a -tags netgo -o release/linux/arm64/drone-gitea-release"
153153
environment:
@@ -159,7 +159,7 @@ steps:
159159

160160
- name: executable
161161
pull: always
162-
image: golang:1.11
162+
image: golang:1.13
163163
commands:
164164
- ./release/linux/arm64/drone-gitea-release --help
165165

@@ -218,7 +218,7 @@ platform:
218218
steps:
219219
- name: build-push
220220
pull: always
221-
image: golang:1.11
221+
image: golang:1.13
222222
commands:
223223
- "go build -v -ldflags \"-X main.version=${DRONE_COMMIT_SHA:0:8}\" -a -tags netgo -o release/linux/arm/drone-gitea-release"
224224
environment:
@@ -231,7 +231,7 @@ steps:
231231

232232
- name: build-tag
233233
pull: always
234-
image: golang:1.11
234+
image: golang:1.13
235235
commands:
236236
- "go build -v -ldflags \"-X main.version=${DRONE_TAG##v}\" -a -tags netgo -o release/linux/arm/drone-gitea-release"
237237
environment:
@@ -243,7 +243,7 @@ steps:
243243

244244
- name: executable
245245
pull: always
246-
image: golang:1.11
246+
image: golang:1.13
247247
commands:
248248
- ./release/linux/arm/drone-gitea-release --help
249249

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/drone-plugins/drone-gitea-release
33
go 1.14
44

55
require (
6-
code.gitea.io/sdk/gitea v0.12.0
6+
code.gitea.io/sdk/gitea v0.13.0
77
github.com/Sirupsen/logrus v1.0.5
88
github.com/joho/godotenv v1.2.0
99
github.com/onsi/ginkgo v1.12.2 // indirect

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
code.gitea.io/sdk/gitea v0.12.0 h1:hvDCz4wtFvo7rf5Ebj8tGd4aJ4wLPKX3BKFX9Dk1Pgs=
2-
code.gitea.io/sdk/gitea v0.12.0/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY=
1+
code.gitea.io/sdk/gitea v0.13.0 h1:iHognp8ZMhMFLooUUNZFpm8IHaC9qoHJDvAE5vTm5aw=
2+
code.gitea.io/sdk/gitea v0.13.0/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY=
33
github.com/Sirupsen/logrus v1.0.5 h1:447dy9LxSj+Iaa2uN3yoFHOzU9yJcJYiQPtNz8OXtv0=
44
github.com/Sirupsen/logrus v1.0.5/go.mod h1:rmk17hk6i8ZSAJkSDa7nOxamrG+SP4P0mm+DAvExv4U=
55
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=

‎plugin.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,18 +110,19 @@ func (p Plugin) Exec() error {
110110
}
111111
}
112112

113-
client := gitea.NewClient(p.Config.BaseURL, p.Config.APIKey)
114-
113+
httpClient := &http.Client{}
115114
if p.Config.Insecure {
116115
cookieJar, _ := cookiejar.New(nil)
117-
118-
var insecureClient = &http.Client{
116+
httpClient = &http.Client{
119117
Jar: cookieJar,
120118
Transport: &http.Transport{
121119
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
122120
},
123121
}
124-
client.SetHTTPClient(insecureClient)
122+
}
123+
client, err := gitea.NewClient(p.Config.BaseURL, gitea.SetToken(p.Config.APIKey), gitea.SetHTTPClient(httpClient))
124+
if err != nil {
125+
return err
125126
}
126127

127128
rc := releaseClient{

‎release.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func (rc *releaseClient) buildRelease() (*gitea.Release, error) {
4242
}
4343

4444
func (rc *releaseClient) getRelease() (*gitea.Release, error) {
45-
releases, err := rc.Client.ListReleases(rc.Owner, rc.Repo, gitea.ListReleasesOptions{})
45+
releases, _, err := rc.Client.ListReleases(rc.Owner, rc.Repo, gitea.ListReleasesOptions{})
4646
if err != nil {
4747
return nil, err
4848
}
@@ -65,7 +65,7 @@ func (rc *releaseClient) newRelease() (*gitea.Release, error) {
6565
Note: rc.Note,
6666
}
6767

68-
release, err := rc.Client.CreateRelease(rc.Owner, rc.Repo, r)
68+
release, _, err := rc.Client.CreateRelease(rc.Owner, rc.Repo, r)
6969
if err != nil {
7070
return nil, fmt.Errorf("Failed to create release: %s", err)
7171
}
@@ -75,7 +75,7 @@ func (rc *releaseClient) newRelease() (*gitea.Release, error) {
7575
}
7676

7777
func (rc *releaseClient) uploadFiles(releaseID int64, files []string) error {
78-
attachments, err := rc.Client.ListReleaseAttachments(rc.Owner, rc.Repo, releaseID, gitea.ListReleaseAttachmentsOptions{})
78+
attachments, _, err := rc.Client.ListReleaseAttachments(rc.Owner, rc.Repo, releaseID, gitea.ListReleaseAttachmentsOptions{})
7979

8080
if err != nil {
8181
return fmt.Errorf("Failed to fetch existing assets: %s", err)
@@ -113,15 +113,15 @@ files:
113113

114114
for _, attachment := range attachments {
115115
if attachment.Name == path.Base(file) {
116-
if err := rc.Client.DeleteReleaseAttachment(rc.Owner, rc.Repo, releaseID, attachment.ID); err != nil {
116+
if _, err := rc.Client.DeleteReleaseAttachment(rc.Owner, rc.Repo, releaseID, attachment.ID); err != nil {
117117
return fmt.Errorf("Failed to delete %s artifact: %s", file, err)
118118
}
119119

120120
fmt.Printf("Successfully deleted old %s artifact\n", attachment.Name)
121121
}
122122
}
123123

124-
if _, err = rc.Client.CreateReleaseAttachment(rc.Owner, rc.Repo, releaseID, handle, path.Base(file)); err != nil {
124+
if _, _, err = rc.Client.CreateReleaseAttachment(rc.Owner, rc.Repo, releaseID, handle, path.Base(file)); err != nil {
125125
return fmt.Errorf("Failed to upload %s artifact: %s", file, err)
126126
}
127127

0 commit comments

Comments
 (0)