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.

Sign up for GitHub

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

.travis,Makefile,functional: Bump go 1.12 version to v1.12.17 #12882

Merged
merged 1 commit into from
Apr 20, 2021
Merged

.travis,Makefile,functional: Bump go 1.12 version to v1.12.17 #12882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sudo: required
services: docker

go:
- 1.12.12
- 1.12.17
- 1.15.11

notifications:
Expand All @@ -28,12 +28,12 @@ env:
matrix:
fast_finish: true
allow_failures:
- go: 1.12.12
- go: 1.12.17
env: TARGET=linux-amd64-grpcproxy
- go: 1.12.12
- go: 1.12.17
env: TARGET=linux-386-unit
exclude:
- go: 1.15.7
- go: 1.15.11
env: TARGET=linux-amd64-integration-1-cpu
- go: 1.15.11
env: TARGET=linux-amd64-integration-2-cpu
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ docker-remove:



GO_VERSION ?= 1.12.12
GO_VERSION ?= 1.12.17
ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound")

TEST_SUFFIX = $(shell date +%s | base64 | head -c 15)
Expand All @@ -65,11 +65,11 @@ endif


# Example:
# GO_VERSION=1.12.12 make build-docker-test
# GO_VERSION=1.12.17 make build-docker-test
# make build-docker-test
#
# gcloud docker -- login -u _json_key -p "$(cat /etc/gcp-key-etcd-development.json)" https://gcr.io
# GO_VERSION=1.12.12 make push-docker-test
# GO_VERSION=1.12.17 make push-docker-test
# make push-docker-test
#
# gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com
Expand Down
2 changes: 1 addition & 1 deletion functional/scripts/docker-local-agent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-agent.sh" ]]; then
fi

if [[ -z "${GO_VERSION}" ]]; then
GO_VERSION=1.12.12
GO_VERSION=1.12.17
fi
echo "Running with GO_VERSION:" ${GO_VERSION}

Expand Down
2 changes: 1 addition & 1 deletion functional/scripts/docker-local-tester.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-tester.sh" ]]; then
fi

if [[ -z "${GO_VERSION}" ]]; then
GO_VERSION=1.12.12
GO_VERSION=1.12.17
fi
echo "Running with GO_VERSION:" ${GO_VERSION}

Expand Down