From e5123781180f5824d290d5137d89effe2c00c0ea Mon Sep 17 00:00:00 2001
From: "R.B. Boyer" <rb@hashicorp.com>
Date: Mon, 23 Sep 2019 11:08:53 -0500
Subject: [PATCH] ci: ensure build-distros uses the same go.mod file as normal
 builds

When running 'make tools' the go command indirectly edits both the
go.mod and go.sum files in ways that can cause the later build of consul
itself to build with slightly different dependencies than it normally
would.
---
 .circleci/config.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4fb8f1124..f72c79a8e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -146,7 +146,10 @@ jobs:
     resource_class: large
     steps:
       - checkout
-      - run: make tools
+      - run: |
+          make tools
+          # restore any go.{mod,sum} files that were updated indirectly
+          git reset --hard HEAD
       - run: ./build-support/scripts/build-local.sh
 
       # save dev build to CircleCI