From 0016e21cd6b3cc267a9b0d99adb9ba13bde48e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Wed, 22 Dec 2021 10:53:03 +0100
Subject: [PATCH] modules: Set GOCACHE env var

This was introduced in Go 1.15. We do set the GOPATH, which should be enough, but #9309 indicate that's not the case on every platform (GitHub Actions).

Closes #9309
---
 modules/client.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/client.go b/modules/client.go
index 1924cd5b4c6..5b61e564432 100644
--- a/modules/client.go
+++ b/modules/client.go
@@ -90,6 +90,8 @@ func NewClient(cfg ClientConfig) *Client {
 		"GOPRIVATE", mcfg.Private,
 		"GONOPROXY", mcfg.NoProxy,
 		"GOPATH", cfg.CacheDir,
+		// GOCACHE was introduced in Go 1.15. This matches the location derived from GOPATH above.
+		"GOCACHE", filepath.Join(cfg.CacheDir, "pkg", "mod"),
 	)
 
 	logger := cfg.Logger