Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12882 from lilic/bump-go-12

Browse Source 
.travis,Makefile,functional: Bump go 1.12 version to v1.12.17
This commit is contained in:
Piotr Tabor 2021-04-20 23:33:23 +02:00 committed by GitHub
commit ceafa1b33e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -6,7 +6,7 @@ sudo: required
services: docker services: docker
go: go:
- 1.12.12 - 1.12.17
- 1.15.11 - 1.15.11
notifications: notifications:
@ -28,12 +28,12 @@ env:
matrix: matrix:
fast_finish: true fast_finish: true
allow_failures: allow_failures:
- go: 1.12.12 - go: 1.12.17
env: TARGET=linux-amd64-grpcproxy env: TARGET=linux-amd64-grpcproxy
- go: 1.12.12 - go: 1.12.17
env: TARGET=linux-386-unit env: TARGET=linux-386-unit
exclude: exclude:
- go: 1.15.7 - go: 1.15.11
env: TARGET=linux-amd64-integration-1-cpu env: TARGET=linux-amd64-integration-1-cpu
- go: 1.15.11 - go: 1.15.11
env: TARGET=linux-amd64-integration-2-cpu env: TARGET=linux-amd64-integration-2-cpu

6
Makefile
View File

@ -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") ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound")
TEST_SUFFIX = $(shell date +%s | base64 | head -c 15) TEST_SUFFIX = $(shell date +%s | base64 | head -c 15)
@ -65,11 +65,11 @@ endif
# Example: # Example:
# GO_VERSION=1.12.12 make build-docker-test # GO_VERSION=1.12.17 make build-docker-test
# 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 # 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 # make push-docker-test
# #
# gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com # gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com

2
functional/scripts/docker-local-agent.sh
View File

@ -13,7 +13,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-agent.sh" ]]; then
fi fi
if [[ -z "${GO_VERSION}" ]]; then if [[ -z "${GO_VERSION}" ]]; then
GO_VERSION=1.12.12 GO_VERSION=1.12.17
fi fi
echo "Running with GO_VERSION:" ${GO_VERSION} echo "Running with GO_VERSION:" ${GO_VERSION}

2
functional/scripts/docker-local-tester.sh
View File

@ -6,7 +6,7 @@ if ! [[ "${0}" =~ "scripts/docker-local-tester.sh" ]]; then
fi fi
if [[ -z "${GO_VERSION}" ]]; then if [[ -z "${GO_VERSION}" ]]; then
GO_VERSION=1.12.12 GO_VERSION=1.12.17
fi fi
echo "Running with GO_VERSION:" ${GO_VERSION} echo "Running with GO_VERSION:" ${GO_VERSION}