diff --git a/go.mod b/go.mod index aadc2ab..8737426 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( git.ohea.xyz/golang/config v0.0.0-20220915224621-b9debd233173 github.com/go-git/go-git/v5 v5.4.3-0.20220529141257-bc1f419cebcf - github.com/go-playground/webhooks/v6 v6.0.0-00010101000000-000000000000 + github.com/go-playground/webhooks/v6 v6.0.1 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 nhooyr.io/websocket v1.8.7 ) @@ -39,4 +39,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/go-playground/webhooks/v6 => git.ohea.xyz/cursorius/webhooks/v6 v6.0.2-0.20221224045412-1c899982c188 +replace github.com/go-playground/webhooks/v6 => git.ohea.xyz/cursorius/webhooks/v6 v6.0.2-0.20221224221147-a2bdbf1756ed diff --git a/go.sum b/go.sum index c5adffc..1842317 100644 --- a/go.sum +++ b/go.sum @@ -78,8 +78,8 @@ contrib.go.opencensus.io/exporter/stackdriver v0.13.5/go.mod h1:aXENhDJ1Y4lIg4EU contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE= contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -git.ohea.xyz/cursorius/webhooks/v6 v6.0.2-0.20221224045412-1c899982c188 h1:z7IjzViAhXsItVV1hmSTHL27AtfpMBbDg47Qk/wxjtc= -git.ohea.xyz/cursorius/webhooks/v6 v6.0.2-0.20221224045412-1c899982c188/go.mod h1:64JKTmG3kupV+3+ZYJYPB/rGPEKw/diihhIj8lut4UA= +git.ohea.xyz/cursorius/webhooks/v6 v6.0.2-0.20221224221147-a2bdbf1756ed h1:gsK15m4Npow74+R6OfZKwwAg1sl7QWQCRXOeE2QLUco= +git.ohea.xyz/cursorius/webhooks/v6 v6.0.2-0.20221224221147-a2bdbf1756ed/go.mod h1:64JKTmG3kupV+3+ZYJYPB/rGPEKw/diihhIj8lut4UA= git.ohea.xyz/golang/config v0.0.0-20220915224621-b9debd233173 h1:dhq/W6sa5KkLHVBwwgcNIPWcO4YK2/ecFTTln2W+1n8= git.ohea.xyz/golang/config v0.0.0-20220915224621-b9debd233173/go.mod h1:86PbXJ2WdqQ+3hYqrnv3ukgKNRK9nQfThnlY03FAO0g= git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= diff --git a/listen/listen.go b/listen/listen.go index 7a22c16..308c7cb 100644 --- a/listen/listen.go +++ b/listen/listen.go @@ -52,11 +52,19 @@ func setupHTTPServer(runCh chan jobscheduler.Run, registerCh chan jobscheduler.R return } log.Infof("Got webhook with payload %v", payload) - runCh <- jobscheduler.Run{ - JobName: jobName, - JobConfig: jobConfig, - Ref: "master", + + switch payload.(type) { + case gitea.PushPayload: + pushPayload := payload.(gitea.PushPayload) + + runCh <- jobscheduler.Run{ + JobName: jobName, + JobConfig: jobConfig, + Ref: pushPayload.Ref, + } + } + return default: log.Errorf("Job configured with unknown webhook sender \"%v\", igonring...", jobConfig.Webhook.Sender)