diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-05-25 22:42:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-25 22:42:40 +0800 |
| commit | dd5ed01f3b5ff5e426c9e2e4a55a8b05b10bc78d (patch) | |
| tree | a05f2d0db54bb20a4b3180bbd4cc005cf8d5aac7 | |
| parent | b7ff0d42e3adbacd6f4186c633cf73d06bd16324 (diff) | |
| parent | 6231edcbab4ea49f2b03fd893b985cef150b2ed7 (diff) | |
| download | dexon-dd5ed01f3b5ff5e426c9e2e4a55a8b05b10bc78d.tar dexon-dd5ed01f3b5ff5e426c9e2e4a55a8b05b10bc78d.tar.gz dexon-dd5ed01f3b5ff5e426c9e2e4a55a8b05b10bc78d.tar.bz2 dexon-dd5ed01f3b5ff5e426c9e2e4a55a8b05b10bc78d.tar.lz dexon-dd5ed01f3b5ff5e426c9e2e4a55a8b05b10bc78d.tar.xz dexon-dd5ed01f3b5ff5e426c9e2e4a55a8b05b10bc78d.tar.zst dexon-dd5ed01f3b5ff5e426c9e2e4a55a8b05b10bc78d.zip | |
Merge pull request #14514 from karalabe/go1.8.3
travis, appveyor: bump to Go 1.8.3, Android NDK 14b
| -rw-r--r-- | .travis.yml | 24 | ||||
| -rw-r--r-- | appveyor.yml | 4 |
2 files changed, 14 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index e3cbf4630..96e429959 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ matrix: - os: linux dist: trusty sudo: required - go: 1.7.5 + go: 1.7.6 script: - sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install fuse - sudo modprobe fuse @@ -19,7 +19,7 @@ matrix: - os: linux dist: trusty sudo: required - go: 1.8.1 + go: 1.8.3 script: - sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install fuse - sudo modprobe fuse @@ -29,7 +29,7 @@ matrix: - go run build/ci.go test -coverage -misspell - os: osx - go: 1.8.1 + go: 1.8.3 sudo: required script: - brew update @@ -42,7 +42,7 @@ matrix: - os: linux dist: trusty sudo: required - go: 1.8.1 + go: 1.8.3 env: - ubuntu-ppa - azure-linux @@ -80,7 +80,7 @@ matrix: sudo: required services: - docker - go: 1.8.1 + go: 1.8.3 env: - azure-linux-mips script: @@ -120,16 +120,16 @@ matrix: - azure-android - maven-android 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 GOROOT=`pwd`/go - export GOPATH=$HOME/go script: # 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 - - unzip -q android-ndk-r13b.zip && rm android-ndk-r13b.zip - - mv android-ndk-r13b $HOME - - export ANDROID_NDK=$HOME/android-ndk-r13b + - curl https://dl.google.com/android/repository/android-ndk-r14b-linux-x86_64.zip -o android-ndk-r14b.zip + - unzip -q android-ndk-r14b.zip && rm android-ndk-r14b.zip + - mv android-ndk-r14b $HOME + - export ANDROID_NDK=$HOME/android-ndk-r14b - mkdir -p $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 - os: osx - go: 1.8.1 + go: 1.8.3 env: - azure-osx - azure-ios @@ -163,7 +163,7 @@ matrix: - os: linux dist: trusty sudo: required - go: 1.8.1 + go: 1.8.3 env: - azure-purge script: diff --git a/appveyor.yml b/appveyor.yml index aecf48d47..5bdcbc486 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,8 +22,8 @@ environment: install: - rmdir C:\go /s /q - - appveyor DownloadFile https://storage.googleapis.com/golang/go1.8.1.windows-%GETH_ARCH%.zip - - 7z x go1.8.1.windows-%GETH_ARCH%.zip -y -oC:\ > NUL + - appveyor DownloadFile https://storage.googleapis.com/golang/go1.8.3.windows-%GETH_ARCH%.zip + - 7z x go1.8.3.windows-%GETH_ARCH%.zip -y -oC:\ > NUL - go version - gcc --version |