Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
823175605f
2 changed files with 7 additions and 2 deletions
|
@ -16,7 +16,7 @@ pipeline:
|
||||||
- ./dist.sh
|
- ./dist.sh
|
||||||
secrets: [ ssh_key ]
|
secrets: [ ssh_key ]
|
||||||
when:
|
when:
|
||||||
event: push
|
event: [ push, tag ]
|
||||||
|
|
||||||
archive:
|
archive:
|
||||||
image: plugins/s3
|
image: plugins/s3
|
||||||
|
|
|
@ -5,6 +5,7 @@ import (
|
||||||
"crypto/sha256"
|
"crypto/sha256"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"math/rand"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
@ -39,6 +40,10 @@ import (
|
||||||
|
|
||||||
var skipRe = regexp.MustCompile(`\[(?i:ci *skip|skip *ci)\]`)
|
var skipRe = regexp.MustCompile(`\[(?i:ci *skip|skip *ci)\]`)
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
rand.Seed(time.Now().UnixNano())
|
||||||
|
}
|
||||||
|
|
||||||
func GetQueueInfo(c *gin.Context) {
|
func GetQueueInfo(c *gin.Context) {
|
||||||
c.IndentedJSON(200,
|
c.IndentedJSON(200,
|
||||||
Config.Services.Queue.Info(c),
|
Config.Services.Queue.Info(c),
|
||||||
|
@ -492,7 +497,7 @@ func (b *builder) Build() ([]*buildItem, error) {
|
||||||
fmt.Sprintf(
|
fmt.Sprintf(
|
||||||
"%d_%d",
|
"%d_%d",
|
||||||
proc.ID,
|
proc.ID,
|
||||||
time.Now().Unix(),
|
rand.Int(),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
compiler.WithEnviron(proc.Environ),
|
compiler.WithEnviron(proc.Environ),
|
||||||
|
|
Loading…
Reference in a new issue