Browse Source

Merge pull request #37592 from kolyshkin/no-go-version-env

hack/make.ps1: don't rely on GO_VERSION
Vincent Demeester 7 years ago
parent
commit
b1ba744a24
1 changed files with 1 additions and 1 deletions
  1. 1 1
      hack/make.ps1

+ 1 - 1
hack/make.ps1

@@ -130,7 +130,7 @@ Function Check-InContainer() {
 # outside of a container where it may be out of date with master.
 # outside of a container where it may be out of date with master.
 Function Verify-GoVersion() {
 Function Verify-GoVersion() {
     Try {
     Try {
-        $goVersionDockerfile=(Get-Content ".\Dockerfile" | Select-String "ENV GO_VERSION").ToString().Split(" ")[2]
+        $goVersionDockerfile=(Select-String -Path ".\Dockerfile" -Pattern "^FROM golang:").ToString().Split(" ")[1].SubString(7)
         $goVersionInstalled=(go version).ToString().Split(" ")[2].SubString(2)
         $goVersionInstalled=(go version).ToString().Split(" ")[2].SubString(2)
     }
     }
     Catch [Exception] {
     Catch [Exception] {