From fd44e0d8fb93e317d4e8c40558e8a5120ea17206 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Wed, 23 Sep 2020 15:00:03 -0700 Subject: [PATCH] Force dependency on exp to prevent dirty commit release binaries (#9309) * force dependency for release purposes * revert original idea and add loads of debugging * hey more debugging cool * fix debugging * drilling down debugging * revert to original solution * fix comment --- cmd/minikube/main.go | 3 +++ go.mod | 2 +- go.sum | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmd/minikube/main.go b/cmd/minikube/main.go index 1f379790c5..71bee8516f 100644 --- a/cmd/minikube/main.go +++ b/cmd/minikube/main.go @@ -31,6 +31,9 @@ import ( // Register drivers _ "k8s.io/minikube/pkg/minikube/registry/drvs" + // Force exp dependency + _ "golang.org/x/exp/ebnf" + mlog "github.com/docker/machine/libmachine/log" "github.com/golang/glog" diff --git a/go.mod b/go.mod index 7bcdb6e20b..6170d4656e 100644 --- a/go.mod +++ b/go.mod @@ -73,7 +73,7 @@ require ( github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097 golang.org/x/build v0.0.0-20190927031335-2835ba2e683f golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 - golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 // indirect + golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a golang.org/x/sys v0.0.0-20200523222454-059865788121 diff --git a/go.sum b/go.sum index 5801ce02c5..854420fd06 100644 --- a/go.sum +++ b/go.sum @@ -1206,6 +1206,7 @@ golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 h1:QE6XYQK6naiK1EPAe1g/ILLxN5RBoH5xkJk3CqlMI/Y= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=