Skip to content

Commit

Permalink
Upgrade Golang version to 1.20.6
Browse files Browse the repository at this point in the history
  • Loading branch information
chienhanlin committed Aug 9, 2023
1 parent 9cc7276 commit 1df48d3
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion GO_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.19.10
1.20.6
2 changes: 1 addition & 1 deletion GO_VERSION_WINDOWS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.19.10
1.20.6
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ install-golang:
go install github.com/golang/mock/[email protected]
go install golang.org/x/tools/cmd/[email protected]
GO111MODULE=on go install github.com/fzipp/gocyclo/cmd/[email protected]
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
Expand All @@ -366,7 +366,7 @@ get-deps-init:
go install github.com/golang/mock/[email protected]
go install golang.org/x/tools/cmd/[email protected]
GO111MODULE=on go install github.com/fzipp/gocyclo/cmd/[email protected]
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
Expand Down
2 changes: 1 addition & 1 deletion packaging/amazon-linux-ami-integrated/ecs-agent.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions scripts/run-integ-tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 1df48d3

Please sign in to comment.