test

zoncoen · Feb 21, 2024 · b8559f8 · b8559f8
1 parent 5e7d5bc
commit b8559f8
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 61 deletions.
diff --git a/Makefile b/Makefile
@@ -2,6 +2,7 @@ SHELL := /bin/bash
 .DEFAULT_GOAL := test
 
 GO ?= go
+export GOTOOLCHAIN := "go$(shell $(GO) version | perl -ape '$$_ = $$F[2]; s/go(.+)/$$1/')"
 
 BIN_DIR := $(CURDIR)/.bin
 export GOBIN := $(BIN_DIR)

diff --git a/cmd/scenarigo/cmd/plugin/build.go b/cmd/scenarigo/cmd/plugin/build.go
@@ -463,6 +463,7 @@ func execute(ctx context.Context, wd, name string, args ...string) error {
 func executeWithEnvs(ctx context.Context, envs []string, wd, name string, args ...string) error {
 	var stderr bytes.Buffer
 	cmd := exec.CommandContext(ctx, name, args...)
+	envs = append(envs, fmt.Sprintf("GOTOOLCHAIN=%s", goMajorMinor))
 	cmd.Env = append(os.Environ(), envs...)
 	if wd != "" {
 		cmd.Dir = wd