From 9d4cef89f03b12b4740a9f23e79cd6e510f49495 Mon Sep 17 00:00:00 2001 From: Yecheng Fu Date: Thu, 17 Oct 2019 12:31:39 +0800 Subject: [PATCH] Ensure sort order doesn't depend on locale --- Makefile | 3 +++ go.mod | 4 ++++ hack/pin-deps.sh | 6 ++++++ 3 files changed, 13 insertions(+) diff --git a/Makefile b/Makefile index 995f6845c72..4bd190caedd 100644 --- a/Makefile +++ b/Makefile @@ -143,6 +143,9 @@ lint: tidy: @echo "go mod tidy" + # Ensure sort order doesn't depend on locale + export LANG=C + export LC_ALL=C go mod tidy git diff -U --exit-code go.mod go.sum diff --git a/go.mod b/go.mod index 1597df58944..c6c76ff1cfd 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,7 @@ +// +// Run hack/pin-deps.sh to change pinned dependency versions. +// + module github.com/pingcap/tidb-operator require ( diff --git a/hack/pin-deps.sh b/hack/pin-deps.sh index 9f6e2630d70..a3917b7a1fd 100755 --- a/hack/pin-deps.sh +++ b/hack/pin-deps.sh @@ -5,6 +5,12 @@ VERSION=1.12.5 +# Explicitly opt into go modules, even though we're inside a GOPATH directory +export GO111MODULE=on +# Ensure sort order doesn't depend on locale +export LANG=C +export LC_ALL=C + go mod edit -require k8s.io/kubernetes@v$VERSION #