Run update-go-workspace late in the fix Makefile target #20841
Conversation
The file ./scripts/fix.sh is the one that updates the go modules to make them tidy. However, we're running the update to the workspace before running go mod tidy. Therefore, it is required to run make fix twice right now. Therefore, because we can't change the order of prerequisites (as scripts/fix.sh is not a prereq), call make update-go-workspace after the fix.sh script. Signed-off-by: Ivan Valdes <[email protected]>
|
/approve |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted filessee 19 files with indirect coverage changes @@ Coverage Diff @@
## main #20841 +/- ##
==========================================
+ Coverage 69.17% 69.25% +0.07%
==========================================
Files 422 422
Lines 34824 34824
==========================================
+ Hits 24090 24117 +27
+ Misses 9341 9317 -24
+ Partials 1393 1390 -3 Continue to review full report in Codecov by Sentry.
🚀 New features to boost your workflow:
|
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ahrtr, ivanvc, joshjms The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
4 participants
The file ./scripts/fix.sh updates the go modules to make them tidy. However, we're running the workspace update before go mod tidy (part of the prerequisite targets), since the fix script isn't a prerequisite but the actual target command.
Therefore, it is required to run make fix twice right now. Hence, because we can't change the order of prerequisites, call make update-go-workspace after the fix.sh script.
I'm planning on reworking our fix targets as part of #18409. But right now I'm still working on the verify targets. So, this is just a temporary fix to make the manual dependency update smoother (i.e., #20830).
Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.