mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2024-11-23 10:21:00 +00:00
Merge remote-tracking branch 'origin/0.4.0' into 0.4.0
This commit is contained in:
commit
ef6b621f7f
3 changed files with 11 additions and 5 deletions
|
@ -26,7 +26,8 @@ secret = ""
|
|||
expires = ""
|
||||
|
||||
[database]
|
||||
path = "/etc/drone/drone.db"
|
||||
driver="sqlite3"
|
||||
datasource="/var/lib/drone/drone.sqlite"
|
||||
|
||||
[docker]
|
||||
cert = ""
|
||||
|
|
6
dist/drone/etc/drone/drone.toml
vendored
6
dist/drone/etc/drone/drone.toml
vendored
|
@ -8,7 +8,8 @@ key = ""
|
|||
# expires = ""
|
||||
|
||||
[database]
|
||||
path = "/var/lib/drone/drone.sqlite"
|
||||
driver="sqlite3"
|
||||
datasource="/var/lib/drone/drone.sqlite"
|
||||
|
||||
[docker]
|
||||
cert = ""
|
||||
|
@ -16,7 +17,7 @@ key = ""
|
|||
addr = "unix:///var/run/docker.sock"
|
||||
swarm = ""
|
||||
|
||||
# [service]
|
||||
# [remote]
|
||||
# kind = "github"
|
||||
# base = "https://github.com"
|
||||
# orgs = []
|
||||
|
@ -33,4 +34,3 @@ swarm = ""
|
|||
|
||||
# [agents]
|
||||
# secret = ""
|
||||
|
||||
|
|
|
@ -251,6 +251,10 @@ func (g *GitHub) push(r *http.Request) (*common.Hook, error) {
|
|||
return nil, err
|
||||
}
|
||||
|
||||
if hook.Deleted {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
repo := &common.Repo{}
|
||||
repo.Owner = hook.Repo.Owner.Login
|
||||
if len(repo.Owner) == 0 {
|
||||
|
@ -337,6 +341,7 @@ func (g *GitHub) pullRequest(r *http.Request) (*common.Hook, error) {
|
|||
|
||||
type pushHook struct {
|
||||
Ref string `json:"ref"`
|
||||
Deleted bool `json:"deleted"`
|
||||
|
||||
Head struct {
|
||||
ID string `json:"id"`
|
||||
|
|
Loading…
Reference in a new issue