Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update go version to 1.15 in travis.yml, github actions, dockerfiles #2653

Merged
merged 1 commit into from
Oct 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: 1.12
go-version: 1.15
- uses: actions/checkout@v2
with:
path: src/github.com/aws/amazon-ecs-agent
Expand All @@ -28,7 +28,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: 1.12
go-version: 1.15
- uses: actions/checkout@v2
with:
submodules: true
Expand All @@ -46,7 +46,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: 1.12
go-version: 1.15
- uses: actions/checkout@v2
with:
submodules: true
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
language: go
go_import_path: github.com/aws/amazon-ecs-agent
sudo: false
go:
- 1.12

matrix:
include:
- os: linux
go: 1.15
script:
- make test
- make analyze-cover-profile
- os: windows
go: 1.12
script:
- go test -v -race -tags unit -coverprofile cover.out -timeout 40s ./agent/...
3 changes: 2 additions & 1 deletion agent/api/task/util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@
package task

import (
"fmt"
"reflect"
"testing"
)

func taskN(n int) *Task {
return &Task{
Arn: string(n),
Arn: fmt.Sprint(n),
}
}

Expand Down
2 changes: 1 addition & 1 deletion misc/fluent-logger/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.
FROM golang:1.12
FROM golang:1.15

MAINTAINER Amazon Web Services, Inc.
COPY fluent-logger /
Expand Down
2 changes: 1 addition & 1 deletion misc/gremlin/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
all: gremlin image

gremlin: gremlin.go
docker run -v $(shell pwd):/out -v $(shell pwd)/gremlin.go:/in/gremlin.go -e CGO_ENABLED=0 golang:1.12 go build -a -x -ldflags '-s' -o /out/gremlin /in/gremlin.go
docker run -v $(shell pwd):/out -v $(shell pwd)/gremlin.go:/in/gremlin.go -e CGO_ENABLED=0 golang:1.15 go build -a -x -ldflags '-s' -o /out/gremlin /in/gremlin.go

image: gremlin
@./docker-image
Expand Down
2 changes: 1 addition & 1 deletion misc/netkitten/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
all: netkitten image

netkitten:
docker run -v $(shell pwd):/out -v $(shell pwd)/netkitten.go:/in/netkitten.go -e CGO_ENABLED=0 golang:1.12 go build -a -installsuffix cgo -ldflags '-s' -o /out/netkitten /in/netkitten.go
docker run -v $(shell pwd):/out -v $(shell pwd)/netkitten.go:/in/netkitten.go -e CGO_ENABLED=0 golang:1.15 go build -a -installsuffix cgo -ldflags '-s' -o /out/netkitten /in/netkitten.go

image: netkitten
@./docker-image
Expand Down
2 changes: 1 addition & 1 deletion scripts/dockerfiles/Dockerfile.buildECSCNIPlugins
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.

FROM golang:1.12
FROM golang:1.15
MAINTAINER Amazon Web Services, Inc.

ENV XDG_CACHE_HOME /tmp
Expand Down
2 changes: 1 addition & 1 deletion scripts/dockerfiles/Dockerfile.cleanbuild
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# express or implied. See the License for the specific language governing
# permissions and limitations under the License.

FROM golang:1.12
FROM golang:1.15
MAINTAINER Amazon Web Services, Inc.

ENV XDG_CACHE_HOME /tmp
Expand Down
2 changes: 1 addition & 1 deletion scripts/dockerfiles/Dockerfile.test
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN apt-get update && apt-get install -y \
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/*

ENV GOLANG_VERSION 1.12.4
ENV GOLANG_VERSION 1.15
ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
ENV GOLANG_DOWNLOAD_SHA256 d7d1f1f88ddfe55840712dc1747f37a790cbcaa448f6c9cf51bbe10aa65442f5

Expand Down