Skip to content

Commit

Permalink
prepare-source: Move go fmt to last step
Browse files Browse the repository at this point in the history
When rebasing, the generated code ends up with conflict markers in it
and go fmt quits with an error. This change regenerates the code first
so that fmt is happy with it.
  • Loading branch information
bcl committed Aug 12, 2024
1 parent 1af3bd6 commit 8cfba81
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tools/prepare-source.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ $GO_BINARY download
$GO_BINARY mod tidy
$GO_BINARY mod vendor

# ... the code is formatted correctly, ...
$GO_BINARY fmt ./...

# ... and all code has been regenerated from its sources.
$GO_BINARY generate ./...

# ... the code is formatted correctly, ...
$GO_BINARY fmt ./...

0 comments on commit 8cfba81

Please sign in to comment.