From bad43bbc069cac348a3963d8e28774e41d4de334 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 6 Sep 2018 11:30:20 -0700 Subject: [PATCH] hack/make.ps1: remove the .0 suffix from go version We would like to use a version with .0 suffix (like 1.11.0) in Dockerfile, so that once a .1 version is out (like 1.11.1) we won't accidentally switch to it. Unfortunately it's not possible to use .0 suffix currently as it breaks the check in make.ps1. This patch fixes that. Signed-off-by: Kir Kolyshkin (cherry picked from commit 8ad648b59a2993156586458cc9ff8dcbc89b86e4) Signed-off-by: Sebastiaan van Stijn Upstream-commit: dc5371b4134dd6474a467308da85daaa27914a64 Component: engine --- components/engine/hack/make.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/hack/make.ps1 b/components/engine/hack/make.ps1 index ab2a978e76..ee7aeed480 100644 --- a/components/engine/hack/make.ps1 +++ b/components/engine/hack/make.ps1 @@ -134,7 +134,7 @@ Function Check-InContainer() { # outside of a container where it may be out of date with master. Function Verify-GoVersion() { Try { - $goVersionDockerfile=(Select-String -Path ".\Dockerfile" -Pattern "^FROM golang:").ToString().Split(" ")[1].SubString(7) + $goVersionDockerfile=(Select-String -Path ".\Dockerfile" -Pattern "^FROM golang:").ToString().Split(" ")[1].SubString(7) -replace '\.0$','' $goVersionInstalled=(go version).ToString().Split(" ")[2].SubString(2) } Catch [Exception] {