diff --git a/.appveyor.yml b/.appveyor.yml index c934dc9130d4..8d9703012d2c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,7 +6,7 @@ os: Windows Server 2012 R2 # Environment variables environment: - GOROOT: c:\go + GOROOT: c:\go1.5.3 GOPATH: c:\gopath PYWIN_DL: https://downloads.sourceforge.net/project/pywin32/pywin32/Build%20219/pywin32-219.win32-py2.7.exe matrix: @@ -24,11 +24,14 @@ clone_folder: c:\gopath\src\github.com\elastic\beats cache: - C:\ProgramData\chocolatey\bin -> .appveyor.yml - C:\ProgramData\chocolatey\lib -> .appveyor.yml +- C:\go1.5.3 -> .appveyor.yml - C:\tools\mingw64 -> .appveyor.yml - C:\pywin_inst.exe -> .appveyor.yml # Scripts that run after cloning repository install: + - ps: c:\gopath\src\github.com\elastic\beats\libbeat\scripts\install-go.ps1 -version 1.5.3 + - set PATH=%GOROOT%\bin;%PATH% # AppVeyor installed mingw is 32-bit only. - cinst mingw > mingw-install.txt - ps: Push-AppveyorArtifact mingw-install.txt diff --git a/.travis.yml b/.travis.yml index 8a3087a20c4b..7038086b41ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ services: language: go go: - - 1.5.2 + - 1.5.3 os: - linux diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index d42972130c68..92a3d4eff9f3 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -52,7 +52,7 @@ https://github.com/elastic/beats/compare/1.0.0...master[Check the HEAD diff] ==== Added *Affecting all Beats* -- Update builds to Golang version 1.5.2 +- Update builds to Golang version 1.5.3 - Make logstash output compression level configurable. {pull}630[630] - Add ability to override configuration settings using environment variables {issue}114[114] - Libbeat now always exits through a single exit method for proper cleanup and control {pull}736[736] diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 76af9ff38fa2..44b2c5436024 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -52,7 +52,7 @@ Beats](https://github.com/elastic/beats/blob/master/libbeat/docs/communitybeats. The Beats are Go programs, so install the latest version of [golang](http://golang.org/) if you don't have it already. The current Go version -used for development is Golang 1.5.2. +used for development is Golang 1.5.3. The Beats are Go programs, so install the latest version of [golang](http://golang.org/) if you don't have it already. diff --git a/Dockerfile b/Dockerfile index 8b6361e3d28a..467b8ce8ddb3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.5.2 +FROM golang:1.5.3 MAINTAINER Nicolas Ruflin RUN set -x && \ diff --git a/Vagrantfile b/Vagrantfile index 761da14474d0..16bfc5b4f671 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -19,7 +19,7 @@ # add more boxes here # ------------------- # More development boxes can be added to this file and you can run commands -# like "vagrant up solaris" or "vargrant up winxp" to start them. +# like "vagrant up solaris" or "vagrant up winxp" to start them. # Provisioning for Windows PowerShell $winPsProvision = <