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

[v1.7] backporting: Stop scripts from running on non-Linux #15052

Merged
merged 1 commit into from
Feb 22, 2021

Conversation

gandro
Copy link
Member

@gandro gandro commented Feb 22, 2021

Manual (partial) backport of

Once this PR is merged, you can update the PR labels via:

$ for pr in 14027; do contrib/backporting/set-labels.py $pr done 1.7; done

This does not need a full CI run, as it only touches the backport scripts which are not part of CI.

[ upstream commit 05eabc7 ]

This is mainly for the benefit of macOS users typing in the wrong
terminal.

Signed-off-by: Tom Payne <tom@isovalent.com>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
@gandro gandro requested a review from a team as a code owner February 22, 2021 10:09
@maintainer-s-little-helper maintainer-s-little-helper bot added backport/1.7 kind/backports This PR provides functionality previously merged into master. labels Feb 22, 2021
Copy link
Contributor

@twpayne twpayne left a comment

Choose a reason for hiding this comment

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

I think this is missing the change to contrib/backporting/submit-backport.

@gandro
Copy link
Member Author

gandro commented Feb 22, 2021

I think this is missing the change to contrib/backporting/submit-backport.

Ah, I should have mentioned that: It's already present on the v1.7 due to a merge conflict pulling it in by accident, see #15040 (comment)

@gandro gandro added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Feb 22, 2021
@christarazi christarazi merged commit 4fa670f into cilium:v1.7 Feb 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants