From e71d3a3418f178cc63571a51eccddf81ec396782 Mon Sep 17 00:00:00 2001
From: Sotirios Mantziaris <s.mantziaris@thebeat.co>
Date: Fri, 15 Oct 2021 17:15:43 +0300
Subject: [PATCH] Upgrade Go 1.17 (#166)

---
 Dockerfile                         | 4 ++--
 docker/component/component_test.go | 1 +
 magefile.go                        | 1 +
 targets/test/test.go               | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f09b5d2b..2ba1b2b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16 as builder
+FROM golang:1.17 as builder
 
 ARG GH_TOKEN
 
@@ -8,7 +8,7 @@ RUN git config --global url."https://$GH_TOKEN@github.com/".insteadOf "https://g
     go get github.com/taxibeat/skim/cmd/skim && rm -rf /go/src/github.com/taxibeat/ && \
     git config --global --remove-section url."https://$GH_TOKEN@github.com/"
 
-FROM golang:1.16
+FROM golang:1.17
 
 COPY --from=builder /go/bin/skim /go/bin/skim
 
diff --git a/docker/component/component_test.go b/docker/component/component_test.go
index 252aeb68..cfdd2da1 100644
--- a/docker/component/component_test.go
+++ b/docker/component/component_test.go
@@ -1,3 +1,4 @@
+//go:build component
 // +build component
 
 package component
diff --git a/magefile.go b/magefile.go
index 758fd570..f64a9fee 100644
--- a/magefile.go
+++ b/magefile.go
@@ -1,3 +1,4 @@
+//go:build mage
 // +build mage
 
 package main
diff --git a/targets/test/test.go b/targets/test/test.go
index 1b894142..22e3917a 100644
--- a/targets/test/test.go
+++ b/targets/test/test.go
@@ -26,6 +26,7 @@ var (
 		"-mod=vendor",
 		"-cover",
 		"-race",
+		"-shuffle=on",
 	}
 	// CoverArgs used in coverage targets.
 	CoverArgs = []string{
@@ -35,6 +36,7 @@ var (
 		"-covermode=atomic",
 		"-coverprofile=coverage.txt",
 		"-race",
+		"-shuffle=on",
 	}
 	// Pkgs is the pkg pattern to target.
 	Pkgs = "./..."