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.

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

scripts: remove duplicate bom fix in fix make target #19079

Merged
merged 1 commit into from
Dec 18, 2024

Conversation

ivanvc
Copy link
Member

@ivanvc ivanvc commented Dec 18, 2024

The BOM fix is called from the fix-bom target, which is also a prerequisite for the fix target:

etcd/Makefile

Line 73 in b5c620a

fix: fix-bom fix-lint fix-yamllint sync-toolchain-directive

Therefore, running make fix runs the BOM fix twice.

This is the clipped output from running make fix:

generating bill-of-materials.json                                                                                                                                                  
% (cd tools/mod && 'go' 'install' 'github.com/appscodelabs/license-bill-of-materials')                                                                                             
% '/home/ivan/.local/share/asdf/installs/golang/1.22.9/packages/bin/license-bill-of-materials' '--override-file' './bill-of-materials.override.json' 'go.etcd.io/etcd/api/v3/...' '
go.etcd.io/etcd/pkg/v3/...' 'go.etcd.io/etcd/client/pkg/v3/...' 'go.etcd.io/etcd/client/v2/...' 'go.etcd.io/etcd/client/v3/...' 'go.etcd.io/etcd/server/v3/...' 'go.etcd.io/etcd/et
cdutl/v3/...' 'go.etcd.io/etcd/etcdctl/v3/...' 'go.etcd.io/etcd/tests/v3/...' 'go.etcd.io/etcd/v3/...'                                                                             
bom refreshed                               
...
                                              
./scripts/fix.sh                                                                                                                                                                   
                                                                                                                                                                                   
Fixing etcd code for you...                                                                                                                                                        
                                                                                         
...

generating bill-of-materials.json                                                        
% (cd tools/mod && 'go' 'install' 'github.com/appscodelabs/license-bill-of-materials')   
% '/home/ivan/.local/share/asdf/installs/golang/1.22.9/packages/bin/license-bill-of-materials' '--override-file' './bill-of-materials.override.json' 'go.etcd.io/etcd/api/v3/...' '
go.etcd.io/etcd/pkg/v3/...' 'go.etcd.io/etcd/client/pkg/v3/...' 'go.etcd.io/etcd/client/v2/...' 'go.etcd.io/etcd/client/v3/...' 'go.etcd.io/etcd/server/v3/...' 'go.etcd.io/etcd/et
cdutl/v3/...' 'go.etcd.io/etcd/etcdctl/v3/...' 'go.etcd.io/etcd/tests/v3/...' 'go.etcd.io/etcd/v3/...'                                                                             
bom refreshed                                                                                                                                                                      
Fixing whitespaces in the bash scripts                                                                                                                                             
find ./ -name '*.sh' -print0 | xargs -0 sed -i.bak 's|  |  |g'                                                                                                                     
                                                                                                                                                                                   
SUCCESS: etcd code is fixed :)      

Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.

The BOM fix is called from the fix-bom target, which is also a
prerequisite for the fix target. Therefore, running `make fix` runs the
BOM fix twice.

Signed-off-by: Ivan Valdes <[email protected]>
Copy link

codecov bot commented Dec 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.78%. Comparing base (b5c620a) to head (1dede5f).
Report is 2 commits behind head on main.

Additional details and impacted files

see 18 files with indirect coverage changes

@@            Coverage Diff             @@
##             main   #19079      +/-   ##
==========================================
- Coverage   68.81%   68.78%   -0.03%     
==========================================
  Files         420      420              
  Lines       35640    35640              
==========================================
- Hits        24524    24514      -10     
- Misses       9689     9700      +11     
+ Partials     1427     1426       -1     

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b5c620a...1dede5f. Read the comment docs.

@ahrtr ahrtr merged commit a4e744a into etcd-io:main Dec 18, 2024
35 checks passed
@k8s-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahrtr, ivanvc

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ivanvc ivanvc deleted the remove-duplicate-bom-fix-in-make-fix branch December 18, 2024 20:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

3 participants