Ensure sort order doesn't depend on locale

cofyc · Oct 17, 2019 · 9d4cef8 · 9d4cef8
1 parent 0c36111
commit 9d4cef8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
 
 #