646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
26 lines
849 B
Diff
26 lines
849 B
Diff
diff --git a/internal/server/info_module.go b/internal/server/info_module.go
|
|
index d2513bd..ad2921e 100644
|
|
--- a/internal/server/info_module.go
|
|
+++ b/internal/server/info_module.go
|
|
@@ -8,6 +8,7 @@ import (
|
|
"io/ioutil"
|
|
"log"
|
|
"os"
|
|
+ "os/exec"
|
|
"path/filepath"
|
|
"regexp"
|
|
"strings"
|
|
@@ -756,7 +757,11 @@ func findGoToolchainVersionFromGoRoot(goroot string) (string, error) {
|
|
versionData, err = ioutil.ReadFile(filepath.Join(goroot, "VERSION.cache"))
|
|
}
|
|
if err != nil {
|
|
- return "", fmt.Errorf("failed to get Go toolchain version in GOROOT (%s)", goroot)
|
|
+ cmd := exec.Command("go", "env", "GOVERSION")
|
|
+ versionData, err = cmd.Output()
|
|
+ if err != nil {
|
|
+ return "", fmt.Errorf("failed to get Go toolchain version in GOROOT (%s)", goroot)
|
|
+ }
|
|
}
|
|
matches := findGoVersionRegexp.FindSubmatch(versionData)
|
|
if len(matches) >= 1 {
|