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

improves use of gnu variants on macosx #2522

Closed
wants to merge 1 commit into from

Conversation

jaxesn
Copy link
Member

@jaxesn jaxesn commented Oct 2, 2023

Issue #, if available:

Description of changes:

We had a common "pattern" for certain tools, such as sed + tar +date, where on mac we would try and find the gnu build, which is installable via brew. This introduces a helper and refactors our usage of this pattern so its consistent throughout our scripts.

This will also make it a bit more easier to track which brew formulas someone should install if building locally. I plan to update the building-locally doc in a future PR.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from jaxesn. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@eks-distro-bot eks-distro-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 2, 2023
@@ -842,7 +842,8 @@ release: $(RELEASE_TARGETS)
# Iterate over release branch versions, avoiding branches explicitly marked as skipped
.PHONY: %/release-branches/all
%/release-branches/all:
@for version in $(SUPPORTED_K8S_VERSIONS) ; do \
@set -e; \
Copy link
Member Author

Choose a reason for hiding this comment

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

We actually have this configured at the top, however the version of make on mac does not support the global flag. For this specific target, its annoying not to fail on error so adding it specifically.

@@ -129,7 +149,7 @@ function build::gather_licenses() {
# data about each dependency to generate the amazon approved attribution.txt files
# go-deps is needed for module versions
# go-licenses are all the dependencies found from the module(s) that were passed in via patterns
build::common::echo_and_run go list -deps=true -json ./... | jq -s '' > "${outputdir}/attribution/go-deps.json"
build::common::echo_and_run go list -deps=true -json ./... | jq -s '.' > "${outputdir}/attribution/go-deps.json"
Copy link
Member Author

Choose a reason for hiding this comment

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

i updated jq on my mac and the newer version expects ., i validated this works the same on the old jq as well.

@jaxesn jaxesn force-pushed the jgw/better-mac-handling branch from 1a15155 to bfacb4b Compare October 2, 2023 14:52
@jaxesn jaxesn force-pushed the jgw/better-mac-handling branch from bfacb4b to fc4d274 Compare October 2, 2023 15:55
@abhay-krishna
Copy link
Member

/retest

@eks-distro-bot
Copy link
Collaborator

@jaxesn: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
imagebuilder-1-25-presubmit fc4d274 link true /test imagebuilder-1-25-presubmit
imagebuilder-1-27-presubmit fc4d274 link true /test imagebuilder-1-27-presubmit
imagebuilder-1-28-presubmit fc4d274 link true /test imagebuilder-1-28-presubmit
imagebuilder-1-23-presubmit fc4d274 link true /test imagebuilder-1-23-presubmit
imagebuilder-1-24-presubmit fc4d274 link true /test imagebuilder-1-24-presubmit
imagebuilder-1-26-presubmit fc4d274 link true /test imagebuilder-1-26-presubmit

Full PR test history. Your PR dashboard.

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/test-infra repository. I understand the commands that are listed here.

@jaxesn jaxesn closed this Oct 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants