From 1df48d38da9d63f94c663ccd32747fcdf9dc748b Mon Sep 17 00:00:00 2001 From: Chien-Han Lin Date: Tue, 8 Aug 2023 13:15:24 -0700 Subject: [PATCH] Upgrade Golang version to 1.20.6 --- GO_VERSION | 2 +- GO_VERSION_WINDOWS | 2 +- Makefile | 4 ++-- packaging/amazon-linux-ami-integrated/ecs-agent.spec | 2 +- scripts/run-integ-tests.ps1 | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/GO_VERSION b/GO_VERSION index 88ebadf2c32..e63679c7661 100644 --- a/GO_VERSION +++ b/GO_VERSION @@ -1 +1 @@ -1.19.10 +1.20.6 diff --git a/GO_VERSION_WINDOWS b/GO_VERSION_WINDOWS index 88ebadf2c32..e63679c7661 100644 --- a/GO_VERSION_WINDOWS +++ b/GO_VERSION_WINDOWS @@ -1 +1 @@ -1.19.10 +1.20.6 diff --git a/Makefile b/Makefile index c73a99df604..1d4148633bc 100644 --- a/Makefile +++ b/Makefile @@ -357,7 +357,7 @@ install-golang: go install github.com/golang/mock/mockgen@v1.6.0 go install golang.org/x/tools/cmd/goimports@v0.2.0 GO111MODULE=on go install github.com/fzipp/gocyclo/cmd/gocyclo@v0.6.0 - GO111MODULE=on go install honnef.co/go/tools/cmd/staticcheck@v0.3.2 + GO111MODULE=on go install honnef.co/go/tools/cmd/staticcheck@v0.4.0 touch .get-deps-stamp get-deps: .get-deps-stamp @@ -366,7 +366,7 @@ get-deps-init: go install github.com/golang/mock/mockgen@v1.6.0 go install golang.org/x/tools/cmd/goimports@v0.2.0 GO111MODULE=on go install github.com/fzipp/gocyclo/cmd/gocyclo@v0.6.0 - GO111MODULE=on go install honnef.co/go/tools/cmd/staticcheck@v0.3.2 + GO111MODULE=on go install honnef.co/go/tools/cmd/staticcheck@v0.4.0 amazon-linux-sources.tgz: ./scripts/update-version.sh diff --git a/packaging/amazon-linux-ami-integrated/ecs-agent.spec b/packaging/amazon-linux-ami-integrated/ecs-agent.spec index ea5736ae4da..5df81eb7bc9 100644 --- a/packaging/amazon-linux-ami-integrated/ecs-agent.spec +++ b/packaging/amazon-linux-ami-integrated/ecs-agent.spec @@ -39,7 +39,7 @@ Source3: amazon-ecs-volume-plugin.service Source4: amazon-ecs-volume-plugin.socket Source5: amazon-ecs-volume-plugin.conf -BuildRequires: golang >= 1.19.0 +BuildRequires: golang >= 1.20.0 %if %{with systemd} BuildRequires: systemd Requires: systemd diff --git a/scripts/run-integ-tests.ps1 b/scripts/run-integ-tests.ps1 index 17f395192e8..9a7bc43da3c 100755 --- a/scripts/run-integ-tests.ps1 +++ b/scripts/run-integ-tests.ps1 @@ -59,9 +59,9 @@ Invoke-Expression "${PSScriptRoot}\..\misc\exec-command-agent-test\build.ps1" # Run the tests $cwd = (pwd).Path try { - $env:ECS_LOGLEVEL = 'debug'; go test -race -tags integration -timeout=40m -v ../agent/engine ../agent/stats ../agent/app + $env:ECS_LOGLEVEL = 'debug'; CGO_ENABLED=1 go test -race -tags integration -timeout=40m -v ../agent/engine ../agent/stats ../agent/app if (${LastExitCode} -ne 0) { - $env:ECS_LOGLEVEL = 'debug'; go test -race -tags integration -timeout=40m -v ../agent/engine ../agent/stats ../agent/app + $env:ECS_LOGLEVEL = 'debug'; CGO_ENABLED=1 go test -race -tags integration -timeout=40m -v ../agent/engine ../agent/stats ../agent/app } $testsExitCode = $LastExitCode } finally {