From ba03f4a6b8fa25d8bbbaf0f6e77946d0fdf71402 Mon Sep 17 00:00:00 2001 From: Tom Proctor Date: Wed, 28 Jan 2026 20:13:49 +0000 Subject: [PATCH] use ./tool/go Change-Id: Idc737e816469e46dc5898ae4362cb224404db736 Signed-off-by: Tom Proctor --- .github/workflows/test.yml | 6 +++++- cmd/testwrapper/testwrapper.go | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 415ebf428..98282c9a5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -267,7 +267,11 @@ jobs: - name: build test wrapper working-directory: ${{ github.workspace }}/src - run: go build -o ${{ github.workspace }}/testwrapper.exe ./cmd/testwrapper + run: ./tool/go build -o ${{ github.workspace }}/testwrapper.exe ./cmd/testwrapper + + - name: Set PATH for ./tool/go + shell: bash + run: echo "${{ github.workspace }}/src/tool" >> $GITHUB_PATH - name: test if: matrix.key != 'win-bench' # skip on bench builder diff --git a/cmd/testwrapper/testwrapper.go b/cmd/testwrapper/testwrapper.go index df10a53bc..67146ef7a 100644 --- a/cmd/testwrapper/testwrapper.go +++ b/cmd/testwrapper/testwrapper.go @@ -203,6 +203,12 @@ func runTests(ctx context.Context, attempt int, pt *packageTests, goTestArgs, te } func main() { + versionOutput, err := exec.Command("go", "version").CombinedOutput() + if err != nil { + log.Fatalf("testwrapper: failed to get go version: %v", err) + } + fmt.Printf("testwrapper: using %s", versionOutput) + goTestArgs, packages, testArgs, err := splitArgs(os.Args[1:]) if err != nil { log.Fatal(err)