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.

Sign up for GitHub

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

Jump to bottom

Fixes for update-vendor.sh on OSX and zsh #3694

Merged
merged 1 commit into from
Nov 17, 2020
Merged

Fixes for update-vendor.sh on OSX and zsh #3694

merged 1 commit into from
Nov 17, 2020

Conversation

avorima
Copy link
Contributor

@avorima avorima commented Nov 16, 2020

The update-vendor.sh script needed some fixes to work with zsh on OSX.

Various binaries are expected to be GNU utils, which are not installed by default on OSX. I've added suggestions to install ported binaries using homebrew if they are not found in PATH.

Skip shopt -s lastpipe when $BASH is not defined.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 16, 2020
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 16, 2020
mwielgus
mwielgus approved these changes Nov 16, 2020
View reviewed changes
Copy link
Contributor

@mwielgus mwielgus left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: avorima, mwielgus

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 16, 2020
@avorima
Copy link
Contributor Author

avorima commented Nov 16, 2020

/retest

@k8s-ci-robot
Copy link
Contributor

@avorima: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

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.

@towca
Copy link
Collaborator

towca commented Nov 17, 2020

#3702 should fix the flaky test for good, but for this PR a retest should be enough.

/ok-to-test

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Nov 17, 2020
@avorima
Copy link
Contributor Author

avorima commented Nov 17, 2020

Thank you @towca

/retest

@towca
Copy link
Collaborator

towca commented Nov 17, 2020

I don't think you can restart Travis this way. Could you do a git commit --amend --no-edit? I think this'll trigger another build.

@avorima
Fixes for update-vendor.sh on OSX and zsh
8a000b0 
The update-vendor.sh script needed some fixes to work with zsh on OSX.

Various binaries are expected to be GNU utils, which are not installed
by default on OSX. I've added suggestions to install ported binaries
using homebrew if they are not found in PATH.

Skip `shopt -s lastpipe` when `$BASH` is not defined.
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 17, 2020
@towca
Copy link
Collaborator

towca commented Nov 17, 2020

/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 17, 2020
@k8s-ci-robot k8s-ci-robot merged commit dfc5619 into kubernetes:master Nov 17, 2020
@avorima avorima deleted the update-vendor-osx branch November 17, 2020 17:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mwielgus mwielgus mwielgus approved these changes

@feiskyer feiskyer Awaiting requested review from feiskyer

@Jeffwan Jeffwan Awaiting requested review from Jeffwan

Assignees

@mwielgus mwielgus

@towca towca

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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@avorima @k8s-ci-robot @towca @mwielgus