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

PR-v1.7-backport-2021-02-19 #15040

Merged
merged 4 commits into from
Feb 22, 2021
Merged

PR-v1.7-backport-2021-02-19 #15040

merged 4 commits into from
Feb 22, 2021

Commits on Feb 19, 2021

  1. contrib: Detect correct remote in start-backport 

    [ upstream commit c7e2573 ]

Previously, the script assumed `origin` would point to the upstream
branch. For users with forked repositories this is not necessarily true,
therefore this commit auto-detects the remote name based on the git
remote url.

Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
    @gandro @nathanjsweet
    gandro authored and nathanjsweet committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    830fd44 View commit details
    Browse the repository at this point in the history

  2. contrib: Support alternative orgs in get_remote 

    [ upstream commit bbf5b20 ]

This commit adds a optional positional argument to `get_remote` to allow
obtaining the remote of Cilium forks in other organizations than the
default `cilium` one.

Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
    @gandro @nathanjsweet
    gandro authored and nathanjsweet committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    7097c90 View commit details
    Browse the repository at this point in the history

  3. contrib/submit-backport: Support creating PRs from forks 

    [ upstream commit 0195657 ]

This adds support for pushing backport PRs from Cilium forks. Because
the names of remotes in forked repositories are not standardized, the
`submit-backport` script is changed such that it accepts two branch
arguments: The upstream remote and the user (fork) remote.

The upstream remote is detected using the existing `get_remote` helper,
while the user (fork) remote is guessed by checking for a remote
matching `github.com/<user>/cilium`.

Co-authored-by: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
    @gandro @qmonnet @nathanjsweet
    2 people authored and nathanjsweet committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    c5d2d56 View commit details
    Browse the repository at this point in the history

  4. docs: Document changes to submit-backport 

    [ upstream commit 388e7aa ]

Co-authored-by: Quentin Monnet <quentin@isovalent.com>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
    @gandro @qmonnet @nathanjsweet
    2 people authored and nathanjsweet committed Feb 19, 2021
    Configuration menu
    Copy the full SHA
    11c0960 View commit details
    Browse the repository at this point in the history