Merge pull request #20058 from karalabe/go1.13

travis, Dockerfile, appveyor: bump to Go 1.13
This commit is contained in:
Péter Szilágyi 2019-09-12 12:34:15 +03:00 committed by GitHub
commit 71251c7296
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 16 deletions

View File

@ -18,7 +18,7 @@ jobs:
- stage: build - stage: build
os: linux os: linux
dist: xenial dist: xenial
go: 1.10.x go: 1.11.x
script: script:
- go run build/ci.go install - go run build/ci.go install
- go run build/ci.go test -coverage $TEST_PACKAGES - go run build/ci.go test -coverage $TEST_PACKAGES
@ -26,7 +26,7 @@ jobs:
- stage: build - stage: build
os: linux os: linux
dist: xenial dist: xenial
go: 1.11.x go: 1.12.x
script: script:
- go run build/ci.go install - go run build/ci.go install
- go run build/ci.go test -coverage $TEST_PACKAGES - go run build/ci.go test -coverage $TEST_PACKAGES
@ -35,14 +35,14 @@ jobs:
- stage: build - stage: build
os: linux os: linux
dist: xenial dist: xenial
go: 1.12.x go: 1.13.x
script: script:
- go run build/ci.go install - go run build/ci.go install
- go run build/ci.go test -coverage $TEST_PACKAGES - go run build/ci.go test -coverage $TEST_PACKAGES
- stage: build - stage: build
os: osx os: osx
go: 1.12.x go: 1.13.x
script: script:
- echo "Increase the maximum number of open file descriptors on macOS" - echo "Increase the maximum number of open file descriptors on macOS"
- NOFILE=20480 - NOFILE=20480
@ -61,7 +61,7 @@ jobs:
if: type = push if: type = push
os: linux os: linux
dist: xenial dist: xenial
go: 1.12.x go: 1.13.x
env: env:
- ubuntu-ppa - ubuntu-ppa
git: git:
@ -85,7 +85,7 @@ jobs:
os: linux os: linux
dist: xenial dist: xenial
sudo: required sudo: required
go: 1.12.x go: 1.13.x
env: env:
- azure-linux - azure-linux
git: git:
@ -121,7 +121,7 @@ jobs:
dist: xenial dist: xenial
services: services:
- docker - docker
go: 1.12.x go: 1.13.x
env: env:
- azure-linux-mips - azure-linux-mips
git: git:
@ -167,7 +167,7 @@ jobs:
git: git:
submodules: false # avoid cloning ethereum/tests submodules: false # avoid cloning ethereum/tests
before_install: before_install:
- curl https://dl.google.com/go/go1.12.linux-amd64.tar.gz | tar -xz - curl https://dl.google.com/go/go1.13.linux-amd64.tar.gz | tar -xz
- export PATH=`pwd`/go/bin:$PATH - export PATH=`pwd`/go/bin:$PATH
- export GOROOT=`pwd`/go - export GOROOT=`pwd`/go
- export GOPATH=$HOME/go - export GOPATH=$HOME/go
@ -185,7 +185,7 @@ jobs:
- stage: build - stage: build
if: type = push if: type = push
os: osx os: osx
go: 1.12.x go: 1.13.x
env: env:
- azure-osx - azure-osx
- azure-ios - azure-ios
@ -216,7 +216,7 @@ jobs:
if: type = cron if: type = cron
os: linux os: linux
dist: xenial dist: xenial
go: 1.12.x go: 1.13.x
env: env:
- azure-purge - azure-purge
git: git:

View File

@ -1,5 +1,5 @@
# Build Geth in a stock Go builder container # Build Geth in a stock Go builder container
FROM golang:1.12-alpine as builder FROM golang:1.13-alpine as builder
RUN apk add --no-cache make gcc musl-dev linux-headers git RUN apk add --no-cache make gcc musl-dev linux-headers git

View File

@ -1,5 +1,5 @@
# Build Geth in a stock Go builder container # Build Geth in a stock Go builder container
FROM golang:1.12-alpine as builder FROM golang:1.13-alpine as builder
RUN apk add --no-cache make gcc musl-dev linux-headers git RUN apk add --no-cache make gcc musl-dev linux-headers git

View File

@ -23,8 +23,8 @@ environment:
install: install:
- git submodule update --init - git submodule update --init
- rmdir C:\go /s /q - rmdir C:\go /s /q
- appveyor DownloadFile https://dl.google.com/go/go1.12.9.windows-%GETH_ARCH%.zip - appveyor DownloadFile https://dl.google.com/go/go1.13.windows-%GETH_ARCH%.zip
- 7z x go1.12.9.windows-%GETH_ARCH%.zip -y -oC:\ > NUL - 7z x go1.13.windows-%GETH_ARCH%.zip -y -oC:\ > NUL
- go version - go version
- gcc --version - gcc --version