Bump buildkit to master and fix versions incompatible with go mod 1.13

Bump github.com/gogo/googleapis to v1.3.2
Bump github.com/docker/cli to master

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
This commit is contained in:
Silvin Lubecki
2020-03-03 16:46:38 +01:00
parent 54549235da
commit bbc902b4d6
1384 changed files with 186012 additions and 165455 deletions

View File

@ -37,7 +37,6 @@ type Parser struct {
Name string
Root *ListNode
input string
cur *ListNode
pos int
start int
width int
@ -46,7 +45,7 @@ type Parser struct {
var (
ErrSyntax = errors.New("invalid syntax")
dictKeyRex = regexp.MustCompile(`^'([^']*)'$`)
sliceOperatorRex = regexp.MustCompile(`^(-?[\d]*)(:-?[\d]*)?(:[\d]*)?$`)
sliceOperatorRex = regexp.MustCompile(`^(-?[\d]*)(:-?[\d]*)?(:-?[\d]*)?$`)
)
// Parse parsed the given text and return a node Parser.
@ -94,7 +93,7 @@ func (p *Parser) consumeText() string {
// next returns the next rune in the input.
func (p *Parser) next() rune {
if int(p.pos) >= len(p.input) {
if p.pos >= len(p.input) {
p.width = 0
return eof
}
@ -186,8 +185,7 @@ func (p *Parser) parseInsideAction(cur *ListNode) error {
func (p *Parser) parseRightDelim(cur *ListNode) error {
p.pos += len(rightDelim)
p.consumeText()
cur = p.Root
return p.parseText(cur)
return p.parseText(p.Root)
}
// parseIdentifier scans build-in keywords, like "range" "end"
@ -231,7 +229,7 @@ func (p *Parser) parseRecursive(cur *ListNode) error {
func (p *Parser) parseNumber(cur *ListNode) error {
r := p.peek()
if r == '+' || r == '-' {
r = p.next()
p.next()
}
for {
r = p.next()
@ -266,7 +264,7 @@ Loop:
}
}
text := p.consumeText()
text = string(text[1 : len(text)-1])
text = text[1 : len(text)-1]
if text == "*" {
text = ":"
}
@ -325,6 +323,7 @@ Loop:
if i == 1 {
params[i].Known = true
params[i].Value = params[0].Value + 1
params[i].Derived = true
} else {
params[i].Known = false
params[i].Value = 0
@ -373,7 +372,7 @@ Loop:
}
reg := regexp.MustCompile(`^([^!<>=]+)([!<>=]+)(.+?)$`)
text := p.consumeText()
text = string(text[:len(text)-2])
text = text[:len(text)-2]
value := reg.FindStringSubmatch(text)
if value == nil {
parser, err := parseAction("text", text)