[Automation] Bump Golang version to 1.20.7 (#2791)

* chore: Updated to content "1.20.6" in file ".golangci.yml" Made with ❤️️ by updatecli * chore: Updated to content "1.20.6" in file ".go-version" Made with ❤️️ by updatecli * chore: Updated to content "1.20.7" in file ".golangci.yml" Made with ❤️️ by updatecli * chore: Updated to content "1.20.7" in file ".go-version" Made with ❤️️ by updatecli * Remove test logger as it was causing a race condition in testing * Run go mod tidy. * Fix conflict between go mod download and go mod tidy * Restore log line deleted in merge. * Update to go-testcontainers v0.23.0. This release includes a fix making it compatible with Go 1.20.6+: testcontainers/testcontainers-go#1359 --------- Co-authored-by: apmmachine <[email protected]> Co-authored-by: Julien Lind <[email protected]> Co-authored-by: Michel Laterman <[email protected]> Co-authored-by: michel-laterman <[email protected]> Co-authored-by: Craig MacKenzie <[email protected]>
elastic · Aug 14, 2023 · b3b85e7 · b3b85e7
1 parent 9fbac23
commit b3b85e7
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 446 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.20.5
+1.20.7
diff --git a/.golangci.yml b/.golangci.yml
@@ -3,7 +3,7 @@ run:
   # timeout for analysis, e.g. 30s, 5m, default is 1m
   timeout: 1m
   build-tags: integration
-  go: "1.20.5"
+  go: "1.20.7"
 
 issues:
   # Maximum count of issues with the same text.

diff --git a/Makefile b/Makefile
@@ -135,6 +135,10 @@ notice: ## - Generates the NOTICE.txt file.
 		-noticeTemplate dev-tools/notice/NOTICE.txt.tmpl \
 		-noticeOut NOTICE.txt \
 		-depsOut ""
+	@# Ensure the go.mod file is left unchanged after go mod download all runs.
+	@# go mod download will modify go.sum in a way that conflicts with go mod tidy.
+	@# https://github.com/golang/go/issues/43994#issuecomment-770053099
+	@go mod tidy
 
 .PHONY: check-no-changes
 check-no-changes: