Merge remote-tracking branch 'origin/master'

This commit is contained in:
Brad Rydzewski 2017-05-12 16:06:56 +02:00
commit 823175605f
2 changed files with 7 additions and 2 deletions

View file

@ -16,7 +16,7 @@ pipeline:
- ./dist.sh
secrets: [ ssh_key ]
when:
event: push
event: [ push, tag ]
archive:
image: plugins/s3

View file

@ -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),