build: bring back the go mod and sum files (#718)

close #661

.gitignore

@@ -3,7 +3,5 @@
 .DS_Store
 */.idea
 deps.sh
-/go.sum
-/go.mod
 .idea/
 sync_diff_inspector/config/output/*

Makefile

@@ -31,30 +31,25 @@ define run_unit_test
 	@make failpoint-enable
 	@export log_level=error; \
 	$(GOTEST) -cover $(1) \
-	|| { @make failpoint-disable; exit 1; }
+	|| { make failpoint-disable; exit 1; }
 	@make failpoint-disable
 endef
 
-build: prepare version check importer sync_diff_inspector ddl_checker finish
+build: version check importer sync_diff_inspector ddl_checker
 
 
 failpoint-enable: tools
-	tools/bin/failpoint-ctl enable
+	bin/failpoint-ctl enable
 
 failpoint-disable: tools
-	tools/bin/failpoint-ctl disable
+	bin/failpoint-ctl disable
 
 tools:
-	@echo "install tools..."
-	@cd tools && make
+	@ls bin/failpoint-ctl || { echo "failpoint-ctl not found, installing..."; GOBIN=$$(pwd)/bin go install github.com/pingcap/failpoint/[email protected]; }
 
 version:
 	$(GO) version
 
-prepare:
-	cp go.mod1 go.mod
-	cp go.sum1 go.sum
-
 importer:
 	$(GO) build -ldflags '$(LDFLAGS)' -o bin/importer ./importer
 
@@ -71,7 +66,7 @@ test: version
 	rm -rf /tmp/output
 	$(call run_unit_test,$(PACKAGES))
 
-integration_test: prepare failpoint-enable importer sync_diff_inspector ddl_checker failpoint-disable finish
+integration_test: failpoint-enable importer sync_diff_inspector ddl_checker failpoint-disable
 	@which bin/tidb-server
 	@which bin/tikv-server
 	@which bin/pd-server
@@ -93,15 +88,7 @@ check: fmt
 	#@echo "golint"
 	#@ golint ./... 2>&1 | grep -vE '\.pb\.go' | grep -vE 'vendor' | awk '{print} END{if(NR>0) {exit 1}}'
 
-tidy:
-	cp go.mod1 go.mod
-	cp go.sum1 go.sum
+tidy:	
 	@$(GO) mod tidy
-	cp go.mod go.mod1
-	cp go.sum go.sum1
-
-clean: prepare tidy finish
 
-finish:
-	cp go.mod go.mod1
-	cp go.sum go.sum1
+clean: tidy

go.mod1 → go.mod

@@ -1,5 +1,7 @@
 module github.com/pingcap/tidb-tools
 
+go 1.19
+
 require (
 	github.com/BurntSushi/toml v1.2.1
 	github.com/DATA-DOG/go-sqlmock v1.5.0
@@ -244,10 +246,3 @@ require (
 	sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 // indirect
 	sourcegraph.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67 // indirect
 )
-
-replace github.com/golang/lint => golang.org/x/lint v0.0.0-20190930215403-16217165b5de
-
-// Suppress 'ambiguous imports' error caused by that old tikv/pd also provides `tikv/pd/client`
-replace github.com/tikv/pd => github.com/tikv/pd v1.1.0-beta.0.20230203015356-248b3f0be132
-
-go 1.19