Merge pull request #14514 from karalabe/go1.8.3

travis, appveyor: bump to Go 1.8.3, Android NDK 14b
This commit is contained in:
Péter Szilágyi 2017-05-25 17:42:40 +03:00 committed by GitHub
commit dd5ed01f3b
2 changed files with 14 additions and 14 deletions

View File

@ -6,7 +6,7 @@ matrix:
- os: linux - os: linux
dist: trusty dist: trusty
sudo: required sudo: required
go: 1.7.5 go: 1.7.6
script: script:
- sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install fuse - sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install fuse
- sudo modprobe fuse - sudo modprobe fuse
@ -19,7 +19,7 @@ matrix:
- os: linux - os: linux
dist: trusty dist: trusty
sudo: required sudo: required
go: 1.8.1 go: 1.8.3
script: script:
- sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install fuse - sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install fuse
- sudo modprobe fuse - sudo modprobe fuse
@ -29,7 +29,7 @@ matrix:
- go run build/ci.go test -coverage -misspell - go run build/ci.go test -coverage -misspell
- os: osx - os: osx
go: 1.8.1 go: 1.8.3
sudo: required sudo: required
script: script:
- brew update - brew update
@ -42,7 +42,7 @@ matrix:
- os: linux - os: linux
dist: trusty dist: trusty
sudo: required sudo: required
go: 1.8.1 go: 1.8.3
env: env:
- ubuntu-ppa - ubuntu-ppa
- azure-linux - azure-linux
@ -80,7 +80,7 @@ matrix:
sudo: required sudo: required
services: services:
- docker - docker
go: 1.8.1 go: 1.8.3
env: env:
- azure-linux-mips - azure-linux-mips
script: script:
@ -120,16 +120,16 @@ matrix:
- azure-android - azure-android
- maven-android - maven-android
before_install: before_install:
- curl https://storage.googleapis.com/golang/go1.8.1.linux-amd64.tar.gz | tar -xz - curl https://storage.googleapis.com/golang/go1.8.3.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
script: script:
# Build the Android archive and upload it to Maven Central and Azure # Build the Android archive and upload it to Maven Central and Azure
- curl https://dl.google.com/android/repository/android-ndk-r13b-linux-x86_64.zip -o android-ndk-r13b.zip - curl https://dl.google.com/android/repository/android-ndk-r14b-linux-x86_64.zip -o android-ndk-r14b.zip
- unzip -q android-ndk-r13b.zip && rm android-ndk-r13b.zip - unzip -q android-ndk-r14b.zip && rm android-ndk-r14b.zip
- mv android-ndk-r13b $HOME - mv android-ndk-r14b $HOME
- export ANDROID_NDK=$HOME/android-ndk-r13b - export ANDROID_NDK=$HOME/android-ndk-r14b
- mkdir -p $GOPATH/src/github.com/ethereum - mkdir -p $GOPATH/src/github.com/ethereum
- ln -s `pwd` $GOPATH/src/github.com/ethereum - ln -s `pwd` $GOPATH/src/github.com/ethereum
@ -137,7 +137,7 @@ matrix:
# This builder does the OSX Azure, iOS CocoaPods and iOS Azure uploads # This builder does the OSX Azure, iOS CocoaPods and iOS Azure uploads
- os: osx - os: osx
go: 1.8.1 go: 1.8.3
env: env:
- azure-osx - azure-osx
- azure-ios - azure-ios
@ -163,7 +163,7 @@ matrix:
- os: linux - os: linux
dist: trusty dist: trusty
sudo: required sudo: required
go: 1.8.1 go: 1.8.3
env: env:
- azure-purge - azure-purge
script: script:

View File

@ -22,8 +22,8 @@ environment:
install: install:
- rmdir C:\go /s /q - rmdir C:\go /s /q
- appveyor DownloadFile https://storage.googleapis.com/golang/go1.8.1.windows-%GETH_ARCH%.zip - appveyor DownloadFile https://storage.googleapis.com/golang/go1.8.3.windows-%GETH_ARCH%.zip
- 7z x go1.8.1.windows-%GETH_ARCH%.zip -y -oC:\ > NUL - 7z x go1.8.3.windows-%GETH_ARCH%.zip -y -oC:\ > NUL
- go version - go version
- gcc --version - gcc --version