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

🌱 : Fix make remove-spaces for GNU system #4330

Merged
merged 1 commit into from
Nov 15, 2024

Conversation

damsien
Copy link
Contributor

@damsien damsien commented Nov 15, 2024

This PR is motivated by this issue: #4327.

It is a fix about the make remove-spaces command that was only working on OS X and not GNU based system. It is because the behavior of the sed -i command is different between these two systems (see this stack exchange discussion).

  • On OS X: sed -i ''
  • On GNU: sed -i

So I added a check by using uname to use the sed -i in the correct way depending if we are on GNU based system or on OS X based system.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 15, 2024
@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 15, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @damsien. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 15, 2024
@damsien damsien changed the title 🐛 Fix make remove-spaces for GNU system 🐛 Fix make remove-spaces for GNU system Nov 15, 2024
Copy link
Member

@camilamacedo86 camilamacedo86 left a comment

Choose a reason for hiding this comment

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

I did not tested locally
I have mac.

But it passing in the CI
If that fails for me after we can check
All good

Thank you 🥇

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: camilamacedo86, damsien

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 15, 2024
@camilamacedo86 camilamacedo86 changed the title 🐛 Fix make remove-spaces for GNU system 🌱 : Fix make remove-spaces for GNU system Nov 15, 2024
@camilamacedo86
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 15, 2024
@camilamacedo86 camilamacedo86 merged commit d8f4da2 into kubernetes-sigs:master Nov 15, 2024
17 of 21 checks passed
@camilamacedo86
Copy link
Member

@damsien

See that your solution broke things

Screenshot 2024-11-16 at 09 52 35

So we will revert.
And next one I will ensure locally either before get merged

camilamacedo86 added a commit that referenced this pull request Nov 16, 2024
camilamacedo86 added a commit that referenced this pull request Nov 16, 2024
Revert "🌱 : Fix `make remove-spaces` for GNU system (#4330)"

This reverts commit d8f4da2.
@damsien
Copy link
Contributor Author

damsien commented Nov 16, 2024

@camilamacedo86 I am sorry I didn't had the opportunity to test on a mac (I'm using arch linux). Hope that it didn't take you too long to revert

@camilamacedo86
Copy link
Member

Hi @damsien

@camilamacedo86 I am sorry I didn't had the opportunity to test on a mac (I'm using arch linux). Hope that it didn't take you too long to revert

Not at all. It is all fine
It is my fault; I should test it out locally before approving
Just ping you for yu check so that you might want try out fix it again

@damsien
Copy link
Contributor Author

damsien commented Nov 16, 2024

Thanks! I'll create another PR when I have time to try to fix it again!

vtrenton pushed a commit to vtrenton/kubebuilder that referenced this pull request Nov 20, 2024
vtrenton pushed a commit to vtrenton/kubebuilder that referenced this pull request Nov 20, 2024
…4331)

Revert "🌱 : Fix `make remove-spaces` for GNU system (kubernetes-sigs#4330)"

This reverts commit d8f4da2.
@damsien damsien deleted the make-remove-spaces branch November 20, 2024 20:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants