Browse Source

travis, Dockerfile, appveyor, build: bump to Go 1.10

Péter Szilágyi 7 years ago
parent
commit
669aba8e2c
7 changed files with 29 additions and 23 deletions
  1. 19 8
      .travis.yml
  2. 1 1
      Dockerfile
  3. 1 1
      Dockerfile.alltools
  4. 2 2
      appveyor.yml
  5. 4 9
      build/ci-notes.md
  6. 1 1
      build/deb.control
  7. 1 1
      build/deb.rules

+ 19 - 8
.travis.yml

@@ -14,7 +14,6 @@ matrix:
         - go run build/ci.go install
         - go run build/ci.go install
         - go run build/ci.go test -coverage
         - go run build/ci.go test -coverage
 
 
-    # These are the latest Go versions.
     - os: linux
     - os: linux
       dist: trusty
       dist: trusty
       sudo: required
       sudo: required
@@ -26,8 +25,20 @@ matrix:
         - go run build/ci.go install
         - go run build/ci.go install
         - go run build/ci.go test -coverage
         - go run build/ci.go test -coverage
 
 
+    # These are the latest Go versions.
+    - os: linux
+      dist: trusty
+      sudo: required
+      go: "1.10"
+      script:
+        - sudo modprobe fuse
+        - sudo chmod 666 /dev/fuse
+        - sudo chown root:$USER /etc/fuse.conf
+        - go run build/ci.go install
+        - go run build/ci.go test -coverage
+
     - os: osx
     - os: osx
-      go: 1.9.x
+      go: "1.10"
       script:
       script:
         - unset -f cd # workaround for https://github.com/travis-ci/travis-ci/issues/8703
         - unset -f cd # workaround for https://github.com/travis-ci/travis-ci/issues/8703
         - brew update
         - brew update
@@ -39,7 +50,7 @@ matrix:
     # This builder only tests code linters on latest version of Go
     # This builder only tests code linters on latest version of Go
     - os: linux
     - os: linux
       dist: trusty
       dist: trusty
-      go: 1.9.x
+      go: "1.10"
       env:
       env:
         - lint
         - lint
       git:
       git:
@@ -51,7 +62,7 @@ matrix:
     - os: linux
     - os: linux
       dist: trusty
       dist: trusty
       sudo: required
       sudo: required
-      go: 1.9.x
+      go: "1.10"
       env:
       env:
         - ubuntu-ppa
         - ubuntu-ppa
         - azure-linux
         - azure-linux
@@ -91,7 +102,7 @@ matrix:
       dist: trusty
       dist: trusty
       services:
       services:
         - docker
         - docker
-      go: 1.9.x
+      go: "1.10"
       env:
       env:
         - azure-linux-mips
         - azure-linux-mips
       git:
       git:
@@ -135,7 +146,7 @@ matrix:
       git:
       git:
         submodules: false # avoid cloning ethereum/tests
         submodules: false # avoid cloning ethereum/tests
       before_install:
       before_install:
-        - curl https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz | tar -xz
+        - curl https://storage.googleapis.com/golang/go1.10.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
@@ -152,7 +163,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.9.x
+      go: "1.10"
       env:
       env:
         - azure-osx
         - azure-osx
         - azure-ios
         - azure-ios
@@ -182,7 +193,7 @@ matrix:
     - os: linux
     - os: linux
       dist: trusty
       dist: trusty
       sudo: required
       sudo: required
-      go: 1.9.x
+      go: "1.10"
       env:
       env:
         - azure-purge
         - azure-purge
       git:
       git:

+ 1 - 1
Dockerfile

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

+ 1 - 1
Dockerfile.alltools

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

+ 2 - 2
appveyor.yml

@@ -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://storage.googleapis.com/golang/go1.9.2.windows-%GETH_ARCH%.zip
-  - 7z x go1.9.2.windows-%GETH_ARCH%.zip -y -oC:\ > NUL
+  - appveyor DownloadFile https://storage.googleapis.com/golang/go1.10.windows-%GETH_ARCH%.zip
+  - 7z x go1.10.windows-%GETH_ARCH%.zip -y -oC:\ > NUL
   - go version
   - go version
   - gcc --version
   - gcc --version
 
 

+ 4 - 9
build/ci-notes.md

@@ -2,12 +2,7 @@
 
 
 Tagged releases and develop branch commits are available as installable Debian packages
 Tagged releases and develop branch commits are available as installable Debian packages
 for Ubuntu. Packages are built for the all Ubuntu versions which are supported by
 for Ubuntu. Packages are built for the all Ubuntu versions which are supported by
-Canonical:
-
-- Trusty Tahr (14.04 LTS)
-- Xenial Xerus (16.04 LTS)
-- Yakkety Yak (16.10)
-- Zesty Zapus (17.04)
+Canonical.
 
 
 Packages of develop branch commits have suffix -unstable and cannot be installed alongside
 Packages of develop branch commits have suffix -unstable and cannot be installed alongside
 the stable version. Switching between release streams requires user intervention.
 the stable version. Switching between release streams requires user intervention.
@@ -21,18 +16,18 @@ variable which Travis CI makes available to certain builds.
 We want to build go-ethereum with the most recent version of Go, irrespective of the Go
 We want to build go-ethereum with the most recent version of Go, irrespective of the Go
 version that is available in the main Ubuntu repository. In order to make this possible,
 version that is available in the main Ubuntu repository. In order to make this possible,
 our PPA depends on the ~gophers/ubuntu/archive PPA. Our source package build-depends on
 our PPA depends on the ~gophers/ubuntu/archive PPA. Our source package build-depends on
-golang-1.9, which is co-installable alongside the regular golang package. PPA dependencies
+golang-1.10, which is co-installable alongside the regular golang package. PPA dependencies
 can be edited at https://launchpad.net/%7Eethereum/+archive/ubuntu/ethereum/+edit-dependencies
 can be edited at https://launchpad.net/%7Eethereum/+archive/ubuntu/ethereum/+edit-dependencies
 
 
 ## Building Packages Locally (for testing)
 ## Building Packages Locally (for testing)
 
 
 You need to run Ubuntu to do test packaging.
 You need to run Ubuntu to do test packaging.
 
 
-Add the gophers PPA and install Go 1.9 and Debian packaging tools:
+Add the gophers PPA and install Go 1.10 and Debian packaging tools:
 
 
     $ sudo apt-add-repository ppa:gophers/ubuntu/archive
     $ sudo apt-add-repository ppa:gophers/ubuntu/archive
     $ sudo apt-get update
     $ sudo apt-get update
-    $ sudo apt-get install build-essential golang-1.9 devscripts debhelper
+    $ sudo apt-get install build-essential golang-1.10 devscripts debhelper
 
 
 Create the source packages:
 Create the source packages:
 
 

+ 1 - 1
build/deb.control

@@ -2,7 +2,7 @@ Source: {{.Name}}
 Section: science
 Section: science
 Priority: extra
 Priority: extra
 Maintainer: {{.Author}}
 Maintainer: {{.Author}}
-Build-Depends: debhelper (>= 8.0.0), golang-1.9
+Build-Depends: debhelper (>= 8.0.0), golang-1.10
 Standards-Version: 3.9.5
 Standards-Version: 3.9.5
 Homepage: https://ethereum.org
 Homepage: https://ethereum.org
 Vcs-Git: git://github.com/ethereum/go-ethereum.git
 Vcs-Git: git://github.com/ethereum/go-ethereum.git

+ 1 - 1
build/deb.rules

@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 #export DH_VERBOSE=1
 
 
 override_dh_auto_build:
 override_dh_auto_build:
-	build/env.sh /usr/lib/go-1.9/bin/go run build/ci.go install -git-commit={{.Env.Commit}} -git-branch={{.Env.Branch}} -git-tag={{.Env.Tag}} -buildnum={{.Env.Buildnum}} -pull-request={{.Env.IsPullRequest}}
+	build/env.sh /usr/lib/go-1.10/bin/go run build/ci.go install -git-commit={{.Env.Commit}} -git-branch={{.Env.Branch}} -git-tag={{.Env.Tag}} -buildnum={{.Env.Buildnum}} -pull-request={{.Env.IsPullRequest}}
 
 
 override_dh_auto_test:
 override_dh_auto_test: