From a39f4f10645705eacd0563a3cedb39356f041405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Villablanca=20V=C3=A1squez?= Date: Wed, 6 Nov 2019 12:04:50 -0300 Subject: [PATCH] Change the minor version of go to 1.13 (#13015) * Changed go minor version 12 -> 13 * REQUIREDGOVERSION set to 1.13.0 --- Makefile | 2 +- scripts/prereq-check.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4edd8b5b03..5d1a570c61 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ LDFLAGS += -X "github.com/mattermost/mattermost-server/model.BuildEnterpriseRead GO_MAJOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1) GO_MINOR_VERSION = $(shell $(GO) version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2) MINIMUM_SUPPORTED_GO_MAJOR_VERSION = 1 -MINIMUM_SUPPORTED_GO_MINOR_VERSION = 12 +MINIMUM_SUPPORTED_GO_MINOR_VERSION = 13 GO_VERSION_VALIDATION_ERR_MSG = Golang version is not supported, please update to at least $(MINIMUM_SUPPORTED_GO_MAJOR_VERSION).$(MINIMUM_SUPPORTED_GO_MINOR_VERSION) # GOOS/GOARCH of the build host, used to determine whether we're cross-compiling or not diff --git a/scripts/prereq-check.sh b/scripts/prereq-check.sh index 447c73ff4d..53273050dd 100755 --- a/scripts/prereq-check.sh +++ b/scripts/prereq-check.sh @@ -19,7 +19,7 @@ check_prereq() if check_version $installed_version $required_version; then echo "$dependency minimum requirement met. Required: $required_version, Found: $installed_version" - else + else echo "WARNING! Mattermost did not find the minimum supported version of '$dependency' installed. Required: $required_version, Found: $installed_version" echo "We highly recommend stopping installation and updating dependencies before continuing" read -p "Enter Y to continue anyway (not recommended)." -n 1 -r @@ -35,7 +35,7 @@ echo "Checking prerequisites" REQUIREDNODEVERSION=8.9.0 REQUIREDNPMVERSION=5.6.0 -REQUIREDGOVERSION=1.12.0 +REQUIREDGOVERSION=1.13.0 REQUIREDDOCKERVERSION=17.0 NODEVERSION=$(sed 's/v//' <<< $(node -v))