Disable Go workspaces when running the bingo commands (#117)

bwplotka · Aug 2, 2022 · bc83849 · bc83849
1 parent 95496d7
commit bc83849
Show file tree

Hide file tree

Showing 19 changed files with 905 additions and 26 deletions.
diff --git a/.bingo/cue-gen.sum b/.bingo/cue-gen.sum
diff --git a/pkg/bingo/test.mod b/pkg/bingo/test.mod
@@ -1,3 +1,3 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.17
+go 1.18
diff --git a/pkg/bingo/test2.mod b/pkg/bingo/test2.mod
@@ -1,3 +1,3 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.17
+go 1.18
diff --git a/pkg/bingo/test3.mod b/pkg/bingo/test3.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.17
+go 1.18
 
 require github.com/yolo/best/v100 v100.0.0 // thebest
diff --git a/pkg/bingo/test4.mod b/pkg/bingo/test4.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.17
+go 1.18
 
 require github.com/yolo/best/v100 v100.0.0
diff --git a/pkg/bingo/test5.mod b/pkg/bingo/test5.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.17
+go 1.18
 
 require github.com/yolo/not-best v1
diff --git a/pkg/bingo/variables.go b/pkg/bingo/variables.go
@@ -32,7 +32,7 @@ $({{ $p.EnvVarName }}):{{- range $p.Versions }} $(BINGO_DIR)/{{ .ModFile }}{{- e
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
 {{- range $p.Versions }}
 	@echo "(re)installing $(GOBIN)/{{ $p.Name }}-{{ .Version }}"
-	@cd $(BINGO_DIR) && {{ range $p.BuildEnvVars }}{{ . }} {{ end }}$(GO) build {{ range $p.BuildFlags }}{{ . }} {{ end }}-mod=mod -modfile={{ .ModFile }} -o=$(GOBIN)/{{ $p.Name }}-{{ .Version }} "{{ $p.PackagePath }}"
+	@cd $(BINGO_DIR) && GOWORK=off {{ range $p.BuildEnvVars }}{{ . }} {{ end }}$(GO) build {{ range $p.BuildFlags }}{{ . }} {{ end }}-mod=mod -modfile={{ .ModFile }} -o=$(GOBIN)/{{ $p.Name }}-{{ .Version }} "{{ $p.PackagePath }}"
 {{- end }}
 {{ end}}
 `,

diff --git a/pkg/runner/runner.go b/pkg/runner/runner.go
@@ -115,6 +115,7 @@ func (r *Runner) exec(ctx context.Context, output io.Writer, e envars.EnvSlice,
 	// TODO(bwplotka): Might be surprising, let's return err when this env variable is altered.
 	e = envars.MergeEnvSlices(os.Environ(), e...)
 	e.Set("GO111MODULE=on")
+	e.Set("GOWORK=off")
 	cmd.Env = e
 	cmd.Stdout = output
 	cmd.Stderr = output

diff --git a/testdata/testproject_with_bingo_v0_6/.bingo/Variables.mk b/testdata/testproject_with_bingo_v0_6/.bingo/Variables.mk
@@ -21,47 +21,47 @@ BUILDABLE := $(GOBIN)/buildable-v0.0.0-20210109094001-375d0606849d
 $(BUILDABLE): $(BINGO_DIR)/buildable.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
 	@echo "(re)installing $(GOBIN)/buildable-v0.0.0-20210109094001-375d0606849d"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=buildable.mod -o=$(GOBIN)/buildable-v0.0.0-20210109094001-375d0606849d "github.com/bwplotka/bingo/testdata/module/buildable"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=buildable.mod -o=$(GOBIN)/buildable-v0.0.0-20210109094001-375d0606849d "github.com/bwplotka/bingo/testdata/module/buildable"
 
 BUILDABLE2 := $(GOBIN)/buildable2-v0.0.0-20210109093942-2e6391144e85
 $(BUILDABLE2): $(BINGO_DIR)/buildable2.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
 	@echo "(re)installing $(GOBIN)/buildable2-v0.0.0-20210109093942-2e6391144e85"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=buildable2.mod -o=$(GOBIN)/buildable2-v0.0.0-20210109093942-2e6391144e85 "github.com/bwplotka/bingo/testdata/module/buildable2"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=buildable2.mod -o=$(GOBIN)/buildable2-v0.0.0-20210109093942-2e6391144e85 "github.com/bwplotka/bingo/testdata/module/buildable2"
 
 BUILDABLE_OLD := $(GOBIN)/buildable_old-v0.0.0-20210109093942-2e6391144e85
 $(BUILDABLE_OLD): $(BINGO_DIR)/buildable_old.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
 	@echo "(re)installing $(GOBIN)/buildable_old-v0.0.0-20210109093942-2e6391144e85"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=buildable_old.mod -o=$(GOBIN)/buildable_old-v0.0.0-20210109093942-2e6391144e85 "github.com/bwplotka/bingo/testdata/module/buildable"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=buildable_old.mod -o=$(GOBIN)/buildable_old-v0.0.0-20210109093942-2e6391144e85 "github.com/bwplotka/bingo/testdata/module/buildable"
 
 F2_ARRAY := $(GOBIN)/f2-v1.5.0 $(GOBIN)/f2-v1.1.0 $(GOBIN)/f2-v1.2.0 $(GOBIN)/f2-v1.0.0
 $(F2_ARRAY): $(BINGO_DIR)/f2.mod $(BINGO_DIR)/f2.1.mod $(BINGO_DIR)/f2.2.mod $(BINGO_DIR)/f2.3.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
 	@echo "(re)installing $(GOBIN)/f2-v1.5.0"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=f2.mod -o=$(GOBIN)/f2-v1.5.0 "github.com/fatih/faillint"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=f2.mod -o=$(GOBIN)/f2-v1.5.0 "github.com/fatih/faillint"
 	@echo "(re)installing $(GOBIN)/f2-v1.1.0"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=f2.1.mod -o=$(GOBIN)/f2-v1.1.0 "github.com/fatih/faillint"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=f2.1.mod -o=$(GOBIN)/f2-v1.1.0 "github.com/fatih/faillint"
 	@echo "(re)installing $(GOBIN)/f2-v1.2.0"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=f2.2.mod -o=$(GOBIN)/f2-v1.2.0 "github.com/fatih/faillint"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=f2.2.mod -o=$(GOBIN)/f2-v1.2.0 "github.com/fatih/faillint"
 	@echo "(re)installing $(GOBIN)/f2-v1.0.0"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=f2.3.mod -o=$(GOBIN)/f2-v1.0.0 "github.com/fatih/faillint"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=f2.3.mod -o=$(GOBIN)/f2-v1.0.0 "github.com/fatih/faillint"
 
 FAILLINT := $(GOBIN)/faillint-v1.3.0
 $(FAILLINT): $(BINGO_DIR)/faillint.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
 	@echo "(re)installing $(GOBIN)/faillint-v1.3.0"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=faillint.mod -o=$(GOBIN)/faillint-v1.3.0 "github.com/fatih/faillint"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=faillint.mod -o=$(GOBIN)/faillint-v1.3.0 "github.com/fatih/faillint"
 
 GO_BINDATA := $(GOBIN)/go-bindata-v3.1.1+incompatible
 $(GO_BINDATA): $(BINGO_DIR)/go-bindata.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
 	@echo "(re)installing $(GOBIN)/go-bindata-v3.1.1+incompatible"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=go-bindata.mod -o=$(GOBIN)/go-bindata-v3.1.1+incompatible "github.com/go-bindata/go-bindata/go-bindata"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=go-bindata.mod -o=$(GOBIN)/go-bindata-v3.1.1+incompatible "github.com/go-bindata/go-bindata/go-bindata"
 
 WR_BUILDABLE := $(GOBIN)/wr_buildable-v0.0.0-20210109165512-ccbd4039b94a
 $(WR_BUILDABLE): $(BINGO_DIR)/wr_buildable.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
 	@echo "(re)installing $(GOBIN)/wr_buildable-v0.0.0-20210109165512-ccbd4039b94a"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=wr_buildable.mod -o=$(GOBIN)/wr_buildable-v0.0.0-20210109165512-ccbd4039b94a "github.com/bwplotka/bingo/testdata/module_with_replace/buildable"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=wr_buildable.mod -o=$(GOBIN)/wr_buildable-v0.0.0-20210109165512-ccbd4039b94a "github.com/bwplotka/bingo/testdata/module_with_replace/buildable"
 
diff --git a/testdata/testproject_with_bingo_v0_6/.bingo/buildable.mod b/testdata/testproject_with_bingo_v0_6/.bingo/buildable.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.17
+go 1.18
 
 require github.com/bwplotka/bingo/testdata/module v0.0.0-20210109094001-375d0606849d // buildable
diff --git a/testdata/testproject_with_bingo_v0_6/.bingo/buildable2.mod b/testdata/testproject_with_bingo_v0_6/.bingo/buildable2.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.17
+go 1.18
 
 require github.com/bwplotka/bingo/testdata/module v0.0.0-20210109093942-2e6391144e85 // buildable2
diff --git a/testdata/testproject_with_bingo_v0_6/.bingo/buildable_old.mod b/testdata/testproject_with_bingo_v0_6/.bingo/buildable_old.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.17
+go 1.18
 
 require github.com/bwplotka/bingo/testdata/module v0.0.0-20210109093942-2e6391144e85 // buildable
diff --git a/testdata/testproject_with_bingo_v0_6/.bingo/f2.1.mod b/testdata/testproject_with_bingo_v0_6/.bingo/f2.1.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.17
+go 1.18
 
 require github.com/fatih/faillint v1.1.0
diff --git a/testdata/testproject_with_bingo_v0_6/.bingo/f2.2.mod b/testdata/testproject_with_bingo_v0_6/.bingo/f2.2.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.17
+go 1.18
 
 require github.com/fatih/faillint v1.2.0
diff --git a/testdata/testproject_with_bingo_v0_6/.bingo/f2.3.mod b/testdata/testproject_with_bingo_v0_6/.bingo/f2.3.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.17
+go 1.18
 
 require github.com/fatih/faillint v1.0.0
diff --git a/testdata/testproject_with_bingo_v0_6/.bingo/f2.mod b/testdata/testproject_with_bingo_v0_6/.bingo/f2.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.17
+go 1.18
 
 require github.com/fatih/faillint v1.5.0
diff --git a/testdata/testproject_with_bingo_v0_6/.bingo/faillint.mod b/testdata/testproject_with_bingo_v0_6/.bingo/faillint.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.17
+go 1.18
 
 require github.com/fatih/faillint v1.3.0
diff --git a/testdata/testproject_with_bingo_v0_6/.bingo/go-bindata.mod b/testdata/testproject_with_bingo_v0_6/.bingo/go-bindata.mod
@@ -1,5 +1,5 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.17
+go 1.18
 
 require github.com/go-bindata/go-bindata v3.1.1+incompatible // go-bindata
diff --git a/testdata/testproject_with_bingo_v0_6/.bingo/wr_buildable.mod b/testdata/testproject_with_bingo_v0_6/.bingo/wr_buildable.mod
@@ -1,6 +1,6 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
-go 1.17
+go 1.18
 
 replace github.com/bwplotka/bingo => github.com/pkg/errors v0.9.1