diff --git a/.gitignore b/.gitignore index 19c3e825f..6c837086d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,8 +6,9 @@ drone.sublime-workspace *~ ~* *.sqlite -drone.deb -drone.rpm +*.deb +*.deb.* +*.rpm *.out *.rice-box.go diff --git a/Makefile b/Makefile index 7769a6233..e24c3e709 100644 --- a/Makefile +++ b/Makefile @@ -69,6 +69,7 @@ deb: --vendor "drone.io" -a amd64 \ --config-files /etc/drone/drone.toml \ packaging/root/=/ + cp packaging/output/drone.deb packaging/output/drone.deb.$(SHA) rpm: fpm -s dir -t rpm -n drone -v $(VERSION) -p packaging/output/drone.rpm \ diff --git a/plugin/notify/slack.go b/plugin/notify/slack.go index 395a4df63..7599ba511 100644 --- a/plugin/notify/slack.go +++ b/plugin/notify/slack.go @@ -98,7 +98,5 @@ func (s *Slack) send(msg string, fallback string, color string) error { return err } - go sendJson(s.WebhookUrl, payload, nil) - - return nil + return sendJson(s.WebhookUrl, payload, nil) } diff --git a/server/main.go b/server/main.go index b5192380c..146bc2ca6 100644 --- a/server/main.go +++ b/server/main.go @@ -125,13 +125,10 @@ func main() { pub = pubsub.NewPubSub() // create handler for static resources - assets := rice.MustFindBox("app").HTTPBox() assetserve := http.FileServer(rice.MustFindBox("app").HTTPBox()) http.Handle("/robots.txt", assetserve) + http.Handle("/", assetserve) http.Handle("/static/", http.StripPrefix("/static", assetserve)) - http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { - w.Write(assets.MustBytes("index.html")) - }) // create the router and add middleware mux := router.New()