From c22c1d303f6856baa457d6c5beaf1cc917187d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= <stefantalpalaru@yahoo.com>
Date: Wed, 7 Aug 2019 18:08:48 +0200
Subject: [PATCH] fix the `go-checks` target on macOS and add it to CI

---
 .appveyor.yml | 1 +
 .travis.yml   | 1 +
 Makefile      | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 7d74c1d9a..f0bb5815b 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -39,6 +39,7 @@ test_script:
   - mingw32-make -j2 ARCH_OVERRIDE=%PLATFORM% test
   - IF "%PLATFORM%" == "x64" mingw32-make -j2 test-reproducibility
   - mingw32-make -C vendor/nim-beacon-chain -j2 test
+  - mingw32-make go-checks
 
 deploy: off
 
diff --git a/.travis.yml b/.travis.yml
index dbf19ebca..87005e255 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,4 +32,5 @@ script:
   - ./build/nimbus --help
   - make -j2 test test-reproducibility
   - make -C vendor/nim-beacon-chain -j2 test
+  - make go-checks
 
diff --git a/Makefile b/Makefile
index 73705109a..c09ddd6d7 100644
--- a/Makefile
+++ b/Makefile
@@ -185,7 +185,7 @@ status: | $(REPOS)
 MIN_GO_VER := 1.12.0
 go-checks:
 	which go &>/dev/null || { echo "Go compiler not installed. Aborting."; exit 1; }
-	GO_VER="$$(go version | sed 's/^.*go\(\S\+\).*$$/\1/')"; \
+	GO_VER="$$(go version | sed -E 's/^.*go([0-9.]+).*$$/\1/')"; \
 	       [[ $$(echo -e "$${GO_VER}\n$(MIN_GO_VER)" | sort -t '.' -k 1,1 -k 2,2 -k 3,3 -g | head -n 1) == "$(MIN_GO_VER)" ]] || \
 	       { echo "Minimum Go compiler version required: $(MIN_GO_VER). Version available: $$GO_VER. Aborting."; exit 1; }