From 274e01bb75124507aadcc9ad4e5a4dfd540f6e35 Mon Sep 17 00:00:00 2001 From: Ahmed Al-Hulaibi Date: Tue, 14 Apr 2020 13:51:08 -0400 Subject: [PATCH] misc, docs: Update minimum required golang version to 1.13 --- .travis.yml | 10 +++++----- docker/Dockerfile | 2 +- docker/Dockerfile.development | 2 +- docs/development.md | 2 +- docs/quick-start-guide.md | 2 +- misc/make-deps.sh | 14 +++++++++++--- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 43cd4603..65a939f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,21 +24,21 @@ install: 'make deps' matrix: fast_finish: false allow_failures: - - go: 1.13.x + - go: 1.14.x - go: tip - os: osx # include only one build for osx for a quicker build as the nr. of these runners are sparse include: - name: "basic tests" - go: 1.12.x + go: 1.13.x env: TEST_BLOCK=basic - name: "shell tests" - go: 1.12.x + go: 1.13.x env: TEST_BLOCK=shell - name: "race tests" - go: 1.12.x + go: 1.13.x env: TEST_BLOCK=race - - go: 1.13.x + - go: 1.14.x - go: tip - os: osx script: 'TEST_BLOCK="$TEST_BLOCK" make test' diff --git a/docker/Dockerfile b/docker/Dockerfile index 70a0c3da..1cb24a32 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.12 +FROM golang:1.13 MAINTAINER Michał Czeraszkiewicz diff --git a/docker/Dockerfile.development b/docker/Dockerfile.development index 20c7daf3..0deb9f47 100644 --- a/docker/Dockerfile.development +++ b/docker/Dockerfile.development @@ -1,4 +1,4 @@ -FROM golang:1.12 +FROM golang:1.13 MAINTAINER Michał Czeraszkiewicz diff --git a/docs/development.md b/docs/development.md index 8e70d6ae..eb8afe0c 100644 --- a/docs/development.md +++ b/docs/development.md @@ -28,7 +28,7 @@ required for running the _test_ suite. ### Build -* `golang` 1.12 or higher (required, available in some distros and distributed +* `golang` 1.13 or higher (required, available in some distros and distributed as a binary officially by [golang.org](https://golang.org/dl/)) ### Runtime diff --git a/docs/quick-start-guide.md b/docs/quick-start-guide.md index 0dbddab0..9a0d24c8 100644 --- a/docs/quick-start-guide.md +++ b/docs/quick-start-guide.md @@ -37,7 +37,7 @@ You'll need some dependencies, including `golang`, and some associated tools. #### Installing golang -* You need golang version 1.12 or greater installed. +* You need golang version 1.13 or greater installed. * To install on rpm style systems: `sudo dnf install golang` * To install on apt style systems: `sudo apt install golang` * To install on macOS systems install [Homebrew](https://brew.sh) diff --git a/misc/make-deps.sh b/misc/make-deps.sh index 77e8499e..78dcda46 100755 --- a/misc/make-deps.sh +++ b/misc/make-deps.sh @@ -19,6 +19,14 @@ NEWAPT=`command -v apt 2>/dev/null` BREW=`command -v brew 2>/dev/null` PACMAN=`command -v pacman 2>/dev/null` +# set minimum go version and installed go version +mingoversion=13 +goversion=0 +if [ -x "$GO" ]; then + # capture the minor version number + goversion=$(go version | grep -o -P '(?<=go1\.)[0-9]*') +fi + # if DNF is available use it if [ -x "$DNF" ]; then YUM=$DNF @@ -97,7 +105,7 @@ if [ $travis -eq 0 ]; then fi # attempt to workaround old ubuntu -if [ ! -z "$APT" ] && go version | grep -e 'go1\.[0123456789]\.' -e 'go1\.10\.'; then +if [ ! -z "$APT" ] && [ "$goversion" -lt "$mingoversion" ]; then echo "install golang from a ppa." $sudo_command $APT remove -y golang $sudo_command $APT install -y software-properties-common # for add-apt-repository @@ -107,8 +115,8 @@ if [ ! -z "$APT" ] && go version | grep -e 'go1\.[0123456789]\.' -e 'go1\.10\.'; fi # if golang is too old, we don't want to fail with an obscure error later -if go version | grep -e 'go1\.[0123456789]\.' -e 'go1\.10\.'; then - echo "mgmt recommends go1.11 or higher." +if [ "$goversion" -lt "$mingoversion" ]; then + echo "mgmt recommends go1.$mingoversion or higher." exit 1 fi