Merge pull request #822 from crazy-max/fix-bake-git-protoc

bake: fix protocol detection
pull/826/head
Tõnis Tiigi 3 years ago committed by GitHub
commit 7f0e37531c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -21,9 +21,10 @@ type Input struct {
} }
func ReadRemoteFiles(ctx context.Context, dis []build.DriverInfo, url string, names []string, pw progress.Writer) ([]File, *Input, error) { func ReadRemoteFiles(ctx context.Context, dis []build.DriverInfo, url string, names []string, pw progress.Writer) ([]File, *Input, error) {
st, filename, ok := detectHTTPContext(url) var filename string
st, ok := detectGitContext(url)
if !ok { if !ok {
st, ok = detectGitContext(url) st, filename, ok = detectHTTPContext(url)
if !ok { if !ok {
return nil, nil, errors.Errorf("not url context") return nil, nil, errors.Errorf("not url context")
} }

Loading…
Cancel
Save