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

🌱 Make make remove-spaces compatible with GNU and MAC OS X system #4354

Merged
merged 1 commit into from
Nov 22, 2024

Conversation

damsien
Copy link
Contributor

@damsien damsien commented Nov 20, 2024

Why this PR does exist

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.

This PR follows this one #4330 that was not working. So it got reverted here #4331. This PR should works correctly. I cannot test on a MAC since I only have a linux system.

This PR needs to be tested by someone that has a MAC before merging.

Quick explanation

The bash -c is used because make cannot interpret if & else since it executes each line of the recipe in a separate shell (each command runs in isolation, making the condition ineffective).

Then we check only for "Linux" system and not "Darwin". Why? Because we want the default behavior of the command to be the same as previously (the command that worked for the "Darwin" system).
Thus, if it is a GNU system (uname = Linux), then we execute the modified command. Else, we execute the default behavior -> the previous command.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 20, 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 20, 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 20, 2024
@damsien
Copy link
Contributor Author

damsien commented Nov 20, 2024

@camilamacedo86 Can you please test this one on your system? 😄

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.

Thank you 🥇
I tested locally for mac os and worked

/lgtm
/approved
/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 22, 2024
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 22, 2024
@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 22, 2024
@camilamacedo86
Copy link
Member

Hi @damsien

You need rebase this branch with master for we are able to move forward
Could you please do that?

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 22, 2024
@damsien
Copy link
Contributor Author

damsien commented Nov 22, 2024

Hi @camilamacedo86 , thank you for your test
I just rebased

@camilamacedo86
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 22, 2024
@damsien
Copy link
Contributor Author

damsien commented Nov 22, 2024

/retest

@k8s-ci-robot k8s-ci-robot merged commit 307342a into kubernetes-sigs:master Nov 22, 2024
17 checks passed
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. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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