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: fix shellws pass #19045

Merged
merged 1 commit into from
Dec 14, 2024
Merged

Conversation

ivanvc
Copy link
Member

@ivanvc ivanvc commented Dec 12, 2024

The repository scripts now always have the 'sh' extension. Therefore, the find over '*.sh' matches all scripts without the need to append ./scripts/build-binary.sh, ./scripts/build-docker.sh, and ./scripts/release.sh.

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

Copy link

codecov bot commented Dec 12, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.75%. Comparing base (fe14e24) to head (fad495a).
Report is 19 commits behind head on main.

Additional details and impacted files

see 25 files with indirect coverage changes

@@            Coverage Diff             @@
##             main   #19045      +/-   ##
==========================================
- Coverage   68.77%   68.75%   -0.03%     
==========================================
  Files         420      420              
  Lines       35623    35626       +3     
==========================================
- Hits        24500    24493       -7     
- Misses       9698     9703       +5     
- Partials     1425     1430       +5     

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 fe14e24...fad495a. Read the comment docs.

@ivanvc
Copy link
Member Author

ivanvc commented Dec 12, 2024

/retest

scripts/test.sh Show resolved Hide resolved
@ivanvc ivanvc marked this pull request as draft December 12, 2024 20:12
@ivanvc ivanvc force-pushed the scripts-simplify-shellws-pass branch from e0ebab7 to b45036d Compare December 12, 2024 23:50
@ivanvc ivanvc force-pushed the scripts-simplify-shellws-pass branch from b45036d to a83dd58 Compare December 13, 2024 00:27
@ivanvc ivanvc marked this pull request as ready for review December 13, 2024 00:29
@ivanvc ivanvc requested a review from ahrtr December 13, 2024 00:29
@ivanvc
Copy link
Member Author

ivanvc commented Dec 13, 2024

/retest

scripts/test.sh Outdated Show resolved Hide resolved
@ivanvc ivanvc force-pushed the scripts-simplify-shellws-pass branch from a83dd58 to 8fdb57d Compare December 13, 2024 19:57
@ivanvc ivanvc requested a review from ahrtr December 13, 2024 20:01
@ivanvc ivanvc changed the title scripts: simplify shellws pass scripts: fix shellws pass Dec 13, 2024
Copy link
Member

@ahrtr ahrtr left a comment

Choose a reason for hiding this comment

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

LGTM with minor comment.

Thanks

scripts/test.sh Outdated
if files=$(find . -name '*.sh' -print0 | xargs -0 grep -E -n $'^\s*\t'); then
log_error "FAIL: found tab-based indention in the following bash scripts. Use ' ' (double space):"
log_error "${files}"
log_warning "Suggestion: running \"make fix\" addresses the issue."
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
log_warning "Suggestion: running \"make fix\" addresses the issue."
log_warning "Suggestion: running \"make fix\" to address the issue."

@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

Originally this was intended to be a clean up. But after further
investigation the original code didn't work. It didn't detect tabs in
shell scripts.

Signed-off-by: Ivan Valdes <[email protected]>
@ivanvc ivanvc force-pushed the scripts-simplify-shellws-pass branch from 8fdb57d to fad495a Compare December 13, 2024 20:10
@ivanvc
Copy link
Member Author

ivanvc commented Dec 14, 2024

/retest

@ahrtr ahrtr merged commit b29d086 into etcd-io:main Dec 14, 2024
34 checks passed
@ivanvc ivanvc deleted the scripts-simplify-shellws-pass branch December 14, 2024 17:21
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