Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: simplify go mod tidy check #31266

Merged
merged 5 commits into from
Feb 27, 2025
+8 −23
Merged

build: simplify go mod tidy check #31266

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5332db0
build/ci: simplify doCheckTidy by using -diff flag
islishude Feb 26, 2025
5336fb5
build: fold tidy check into doCheckGenerate
fjl Feb 27, 2025
1f18472
appveyor.yml: remove check_tidy
fjl Feb 27, 2025
e76823e
.github/workflows: remove check_tidy and add check_generate
fjl Feb 27, 2025
7461519
.github/workflows: add check_baddeps on GH runner
fjl Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions build/ci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,21 +352,7 @@ func downloadSpecTestFixtures(csdb *build.ChecksumDB, cachedir string) string {

// doCheckTidy assets that the Go modules files are tidied already.
func doCheckTidy() {
targets := []string{"go.mod", "go.sum"}

hashes, err := build.HashFiles(targets)
if err != nil {
log.Fatalf("failed to hash go.mod/go.sum: %v", err)
}
build.MustRun(new(build.GoToolchain).Go("mod", "tidy"))

tidied, err := build.HashFiles(targets)
if err != nil {
log.Fatalf("failed to rehash go.mod/go.sum: %v", err)
}
if updates := build.DiffHashes(hashes, tidied); len(updates) > 0 {
log.Fatalf("files changed on running 'go mod tidy': %v", updates)
}
build.MustRun(new(build.GoToolchain).Go("mod", "tidy", "-diff"))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The diff will be printed on the Stdout and Stderr, but the output is not checked?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It exits with a non-zero code if the diff is not empty.

fmt.Println("No untidy module files detected.")
}

Expand Down