github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-09-03 09:24:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #167 from benmanns/formatting-vetting

Browse Source 
Formatting and Vetting
This commit is contained in:
Brad Rydzewski
2014-03-06 15:46:40 -08:00
parent 922993c258 4cd5e69e7b
commit ef908ebb94
6 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/build/build.go
View File

@@ -121,8 +121,6 @@ func (b *Builder) Run() error {
b.BuildState.Finished = time.Now().UTC().Unix() b.BuildState.Finished = time.Now().UTC().Unix()
return nil return nil
} }
return nil
} }
func (b *Builder) setup() error { func (b *Builder) setup() error {
@@ -514,7 +512,7 @@ func (b *Builder) writeProxyScript(dir string) error {
// map ip address to localhost // map ip address to localhost
for _, container := range b.services { for _, container := range b.services {
// create an entry for each port // create an entry for each port
for port, _ := range container.NetworkSettings.Ports { for port := range container.NetworkSettings.Ports {
proxyfile.Set(port.Port(), container.NetworkSettings.IPAddress) proxyfile.Set(port.Port(), container.NetworkSettings.IPAddress)
} }
} }

4
pkg/plugin/notify/irc.go
View File

@@ -31,7 +31,8 @@ func (i *IRC) Connect() {
c.AddHandler(irc.CONNECTED, c.AddHandler(irc.CONNECTED,
func(conn *irc.Conn, line *irc.Line) { func(conn *irc.Conn, line *irc.Line) {
conn.Join(i.Channel) conn.Join(i.Channel)
connected <- true}) connected <- true
})
c.Connect(i.Server) c.Connect(i.Server)
<-connected <-connected
i.ClientStarted = true i.ClientStarted = true
@@ -74,7 +75,6 @@ func (i *IRC) sendSuccess(context *Context) error {
return nil return nil
} }
func (i *IRC) send(channel string, message string) error { func (i *IRC) send(channel string, message string) error {
if !i.ClientStarted { if !i.ClientStarted {
i.Connect() i.Connect()

1
pkg/plugin/publish/pypi.go
View File

@@ -1,2 +1 @@
package publish package publish

4
pkg/template/template.go
View File

@@ -1,11 +1,11 @@
package template package template
import ( import (
"crypto/md5"
"errors" "errors"
"fmt" "fmt"
"html/template" "html/template"
"io" "io"
"crypto/md5"
"strings" "strings"
"github.com/GeertJohan/go.rice" "github.com/GeertJohan/go.rice"
@@ -99,7 +99,7 @@ func init() {
h := md5.New() h := md5.New()
io.WriteString(h, mainjs) io.WriteString(h, mainjs)
jshash := fmt.Sprintf("%x", h.Sum(nil)) jshash := fmt.Sprintf("%x", h.Sum(nil))
base = strings.Replace(base, "main.js", "main.js?h=" + jshash, 1) base = strings.Replace(base, "main.js", "main.js?h="+jshash, 1)
// extract the base form template as a string // extract the base form template as a string
form, err := box.String("form.html") form, err := box.String("form.html")