github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-09-25 17:42:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into delrepo

Browse Source
This commit is contained in:
Ulrich Schreiner
2015-02-06 10:30:10 +01:00
parent ae236a3d4d c7c3300350
commit 5f9887a49c
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@@ -6,8 +6,9 @@ drone.sublime-workspace
*~ *~
~* ~*
*.sqlite *.sqlite
drone.deb *.deb
drone.rpm *.deb.*
*.rpm
*.out *.out
*.rice-box.go *.rice-box.go

1
Makefile
View File

@@ -69,6 +69,7 @@ deb:
--vendor "drone.io" -a amd64 \ --vendor "drone.io" -a amd64 \
--config-files /etc/drone/drone.toml \ --config-files /etc/drone/drone.toml \
packaging/root/=/ packaging/root/=/
cp packaging/output/drone.deb packaging/output/drone.deb.$(SHA)
rpm: rpm:
fpm -s dir -t rpm -n drone -v $(VERSION) -p packaging/output/drone.rpm \ fpm -s dir -t rpm -n drone -v $(VERSION) -p packaging/output/drone.rpm \

4
plugin/notify/slack.go
View File

@@ -98,7 +98,5 @@ func (s *Slack) send(msg string, fallback string, color string) error {
return err return err
} }
go sendJson(s.WebhookUrl, payload, nil) return sendJson(s.WebhookUrl, payload, nil)
return nil
} }

5
server/main.go
View File

@@ -125,13 +125,10 @@ func main() {
pub = pubsub.NewPubSub() pub = pubsub.NewPubSub()
// create handler for static resources // create handler for static resources
assets := rice.MustFindBox("app").HTTPBox()
assetserve := http.FileServer(rice.MustFindBox("app").HTTPBox()) assetserve := http.FileServer(rice.MustFindBox("app").HTTPBox())
http.Handle("/robots.txt", assetserve) http.Handle("/robots.txt", assetserve)
http.Handle("/", assetserve)
http.Handle("/static/", http.StripPrefix("/static", 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 // create the router and add middleware
mux := router.New() mux := router.New()