forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-11 14:33:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

build: fold tidy check into doCheckGenerate

Browse source
This commit is contained in:
Felix Lange 2025-02-27 13:06:52 +01:00
parent 5332db0634
commit 5336fb5d23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build/ci.go
View file

@ -25,8 +25,7 @@ Usage: go run build/ci.go <command> <command flags/arguments>
Available commands are: Available commands are:
lint -- runs certain pre-selected linters lint -- runs certain pre-selected linters
check_tidy -- verifies that everything is 'go mod tidy'-ed check_generate -- verifies that 'go generate' and 'go mod tidy' do not produce changes
check_generate -- verifies that everything is 'go generate'-ed
check_baddeps -- verifies that certain dependencies are avoided check_baddeps -- verifies that certain dependencies are avoided
install [ -arch architecture ] [ -cc compiler ] [ packages... ] -- builds packages and executables install [ -arch architecture ] [ -cc compiler ] [ packages... ] -- builds packages and executables
@ -155,8 +154,6 @@ func main() {
doTest(os.Args[2:]) doTest(os.Args[2:])
case "lint": case "lint":
doLint(os.Args[2:]) doLint(os.Args[2:])
case "check_tidy":
doCheckTidy()
case "check_generate": case "check_generate":
doCheckGenerate() doCheckGenerate()
case "check_baddeps": case "check_baddeps":
@ -352,8 +349,6 @@ func downloadSpecTestFixtures(csdb *build.ChecksumDB, cachedir string) string {
// doCheckTidy assets that the Go modules files are tidied already. // doCheckTidy assets that the Go modules files are tidied already.
func doCheckTidy() { func doCheckTidy() {
build.MustRun(new(build.GoToolchain).Go("mod", "tidy", "-diff"))
fmt.Println("No untidy module files detected.")
} }
// doCheckGenerate ensures that re-generating generated files does not cause // doCheckGenerate ensures that re-generating generated files does not cause
@ -361,6 +356,7 @@ func doCheckTidy() {
func doCheckGenerate() { func doCheckGenerate() {
var ( var (
cachedir = flag.String("cachedir", "./build/cache", "directory for caching binaries.") cachedir = flag.String("cachedir", "./build/cache", "directory for caching binaries.")
tc = new(build.GoToolchain)
) )
// Compute the origin hashes of all the files // Compute the origin hashes of all the files
var hashes map[string][32]byte var hashes map[string][32]byte
@ -375,7 +371,7 @@ func doCheckGenerate() {
protocPath = downloadProtoc(*cachedir) protocPath = downloadProtoc(*cachedir)
protocGenGoPath = downloadProtocGenGo(*cachedir) protocGenGoPath = downloadProtocGenGo(*cachedir)
) )
c := new(build.GoToolchain).Go("generate", "./...") c := tc.Go("generate", "./...")
pathList := []string{filepath.Join(protocPath, "bin"), protocGenGoPath, os.Getenv("PATH")} pathList := []string{filepath.Join(protocPath, "bin"), protocGenGoPath, os.Getenv("PATH")}
c.Env = append(c.Env, "PATH="+strings.Join(pathList, string(os.PathListSeparator))) c.Env = append(c.Env, "PATH="+strings.Join(pathList, string(os.PathListSeparator)))
build.MustRun(c) build.MustRun(c)
@ -393,6 +389,10 @@ func doCheckGenerate() {
log.Fatal("One or more generated files were updated by running 'go generate ./...'") log.Fatal("One or more generated files were updated by running 'go generate ./...'")
} }
fmt.Println("No stale files detected.") fmt.Println("No stale files detected.")
// Run go mod tidy check.
build.MustRun(tc.Go("mod", "tidy", "-diff"))
fmt.Println("No untidy module files detected.")
} }
// doCheckBadDeps verifies whether certain unintended dependencies between some // doCheckBadDeps verifies whether certain unintended dependencies between some