Merge remote-tracking branch 'origin/master'

kjgorman · May 12, 2017 · 8231756 · 8231756
2 parents ccb28d0 6d49f99
commit 8231756
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -16,7  16,7 @@ pipeline:
       - ./dist.sh
     secrets: [ ssh_key ]
     when:
-      event: push
       event: [ push, tag ]
 
   archive:
     image: plugins/s3

diff --git a/server/hook.go b/server/hook.go
@@ -5,6  5,7 @@ import (
 	"crypto/sha256"
 	"encoding/json"
 	"fmt"
 	"math/rand"
 	"regexp"
 	"strconv"
 	"time"
@@ -39,6  40,10 @@ import (
 
 var skipRe = regexp.MustCompile(`\[(?i:ci *skip|skip *ci)\]`)
 
 func init() {
 	rand.Seed(time.Now().UnixNano())
 }
 
 func GetQueueInfo(c *gin.Context) {
 	c.IndentedJSON(200,
 		Config.Services.Queue.Info(c),
@@ -492,7  497,7 @@ func (b *builder) Build() ([]*buildItem, error) {
 				fmt.Sprintf(
 					"%d_%d",
 					proc.ID,
-					time.Now().Unix(),
 					rand.Int(),
 				),
 			),
 			compiler.WithEnviron(proc.Environ),