diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2019-09-12 17:34:15 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 17:34:15 +0800 |
| commit | 71251c7296ce79ade37b1705b38447a956319de9 (patch) | |
| tree | fdd14b0daee3bdc7db42e3606656a736bdd2ac85 | |
| parent | 39b0b1a1a6506c8c25fcff56f4d70a85739dcb6a (diff) | |
| parent | 2469c4ecd4757e56ed22da1285ed7deab9d5b112 (diff) | |
| download | go-tangerine-71251c7296ce79ade37b1705b38447a956319de9.tar go-tangerine-71251c7296ce79ade37b1705b38447a956319de9.tar.gz go-tangerine-71251c7296ce79ade37b1705b38447a956319de9.tar.bz2 go-tangerine-71251c7296ce79ade37b1705b38447a956319de9.tar.lz go-tangerine-71251c7296ce79ade37b1705b38447a956319de9.tar.xz go-tangerine-71251c7296ce79ade37b1705b38447a956319de9.tar.zst go-tangerine-71251c7296ce79ade37b1705b38447a956319de9.zip | |
Merge pull request #20058 from karalabe/go1.13
travis, Dockerfile, appveyor: bump to Go 1.13
| -rw-r--r-- | .travis.yml | 24 | ||||
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Dockerfile.alltools | 2 | ||||
| -rw-r--r-- | appveyor.yml | 4 |
4 files changed, 16 insertions, 16 deletions
diff --git a/.travis.yml b/.travis.yml index 3a40ff583..996ec4fdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,15 +18,15 @@ jobs: - stage: build os: linux dist: xenial - go: 1.10.x + go: 1.11.x script: - - go run build/ci.go install - - go run build/ci.go test -coverage $TEST_PACKAGES + - go run build/ci.go install + - go run build/ci.go test -coverage $TEST_PACKAGES - stage: build os: linux dist: xenial - go: 1.11.x + go: 1.12.x script: - go run build/ci.go install - go run build/ci.go test -coverage $TEST_PACKAGES @@ -35,14 +35,14 @@ jobs: - stage: build os: linux dist: xenial - go: 1.12.x + go: 1.13.x script: - go run build/ci.go install - go run build/ci.go test -coverage $TEST_PACKAGES - stage: build os: osx - go: 1.12.x + go: 1.13.x script: - echo "Increase the maximum number of open file descriptors on macOS" - NOFILE=20480 @@ -61,7 +61,7 @@ jobs: if: type = push os: linux dist: xenial - go: 1.12.x + go: 1.13.x env: - ubuntu-ppa git: @@ -85,7 +85,7 @@ jobs: os: linux dist: xenial sudo: required - go: 1.12.x + go: 1.13.x env: - azure-linux git: @@ -121,7 +121,7 @@ jobs: dist: xenial services: - docker - go: 1.12.x + go: 1.13.x env: - azure-linux-mips git: @@ -167,7 +167,7 @@ jobs: git: submodules: false # avoid cloning ethereum/tests 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 GOROOT=`pwd`/go - export GOPATH=$HOME/go @@ -185,7 +185,7 @@ jobs: - stage: build if: type = push os: osx - go: 1.12.x + go: 1.13.x env: - azure-osx - azure-ios @@ -216,7 +216,7 @@ jobs: if: type = cron os: linux dist: xenial - go: 1.12.x + go: 1.13.x env: - azure-purge git: diff --git a/Dockerfile b/Dockerfile index b9dcffb7c..114e76205 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # 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 diff --git a/Dockerfile.alltools b/Dockerfile.alltools index 721b79de3..2f661ba01 100644 --- a/Dockerfile.alltools +++ b/Dockerfile.alltools @@ -1,5 +1,5 @@ # 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 diff --git a/appveyor.yml b/appveyor.yml index 473ee1b78..7d7a575a1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,8 +23,8 @@ environment: install: - git submodule update --init - rmdir C:\go /s /q - - appveyor DownloadFile https://dl.google.com/go/go1.12.9.windows-%GETH_ARCH%.zip - - 7z x go1.12.9.windows-%GETH_ARCH%.zip -y -oC:\ > NUL + - appveyor DownloadFile https://dl.google.com/go/go1.13.windows-%GETH_ARCH%.zip + - 7z x go1.13.windows-%GETH_ARCH%.zip -y -oC:\ > NUL - go version - gcc --version |