github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-09-01 07:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Bitbucket Server branches (#1698)

Browse Source 
Closes #1695
This commit is contained in:
qwerty287
2023-04-07 18:09:17 +02:00
committed by GitHub
parent 0fb978fa98
commit 4b4d078377
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/forge/bitbucketserver/internal/client.go
View File

@@ -43,7 +43,7 @@ const (
pathHookEnabled = "%s/rest/api/1.0/projects/%s/repos/%s/settings/hooks/%s/enabled" pathHookEnabled = "%s/rest/api/1.0/projects/%s/repos/%s/settings/hooks/%s/enabled"
pathHookSettings = "%s/rest/api/1.0/projects/%s/repos/%s/settings/hooks/%s/settings" pathHookSettings = "%s/rest/api/1.0/projects/%s/repos/%s/settings/hooks/%s/settings"
pathStatus = "%s/rest/build-status/1.0/commits/%s" pathStatus = "%s/rest/build-status/1.0/commits/%s"
pathBranches = "%s/2.0/repositories/%s/%s/refs/branches" pathBranches = "%s/rest/api/1.0/projects/%s/repos/%s/branches"
) )
type Client struct { type Client struct {
@@ -326,12 +326,10 @@ func (c *Client) paginatedRepos(start int) ([]*Repo, error) {
func (c *Client) ListBranches(owner, name string) ([]*Branch, error) { func (c *Client) ListBranches(owner, name string) ([]*Branch, error) {
uri := fmt.Sprintf(pathBranches, c.base, owner, name) uri := fmt.Sprintf(pathBranches, c.base, owner, name)
response, err := c.doGet(uri) response, err := c.doGet(uri)
if response != nil {
defer response.Body.Close()
}
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer response.Body.Close()
out := new(BranchResp) out := new(BranchResp)
err = json.NewDecoder(response.Body).Decode(&out) err = json.NewDecoder(response.Body).Decode(&out)
return out.Values, err return out.Values, err

2
server/forge/bitbucketserver/internal/types.go
View File

@@ -211,5 +211,5 @@ type BranchResp struct {
} }
type Branch struct { type Branch struct {
Name string `json:"name"` Name string `json:"displayId"`
} }