Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[1.18] Allow release notes for release branches #3766

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
Merged
merged 1 commit into from
May 14, 2020
Merged

[1.18] Allow release notes for release branches #3766

merged 1 commit into from
May 14, 2020

Conversation

@saschagrunert
Copy link
Member

@saschagrunert saschagrunert commented May 14, 2020 •
edited
Loading

What type of PR is this?

/kind feature

What this PR does / why we need it:

This changes the release notes generation script to also work for
release branches.

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

Needs a forward-port to the master branch as well.

Does this PR introduce a user-facing change?

None

@saschagrunert
Allow release notes for release branches
508f201 
This changes the release notes generation script to also work for
release branches.

Signed-off-by: Sascha Grunert <[email protected]>
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 14, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: saschagrunert

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

@openshift-ci-robot openshift-ci-robot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/feature Categorizes issue or PR as related to a new feature. labels May 14, 2020
@openshift-ci-robot
Copy link

openshift-ci-robot commented May 14, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: saschagrunert

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 14, 2020
@saschagrunert saschagrunert changed the title Allow release notes for release branches [1.18] Allow release notes for release branches May 14, 2020
@TomSweeneyRedHat
Copy link
Contributor

TomSweeneyRedHat commented May 14, 2020

LGTM

@haircommander
Copy link
Member

haircommander commented May 14, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 14, 2020
@openshift-merge-robot openshift-merge-robot merged commit 5cbf694 into cri-o:release-1.18 May 14, 2020
@haircommander
Copy link
Member

haircommander commented May 14, 2020

/cherry-pick master

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented May 14, 2020

@haircommander: #3766 failed to apply on top of branch "master":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	scripts/release-notes/release_notes.go
Falling back to patching base and 3-way merge...
Auto-merging scripts/release-notes/release_notes.go
CONFLICT (content): Merge conflict in scripts/release-notes/release_notes.go
Patch failed at 0001 Allow release notes for release branches

In response to this:

/cherry-pick master

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.

1 similar comment
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented May 14, 2020

@haircommander: #3766 failed to apply on top of branch "master":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	scripts/release-notes/release_notes.go
Falling back to patching base and 3-way merge...
Auto-merging scripts/release-notes/release_notes.go
CONFLICT (content): Merge conflict in scripts/release-notes/release_notes.go
Patch failed at 0001 Allow release notes for release branches

In response to this:

/cherry-pick master

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.

@saschagrunert saschagrunert deleted the release-1.18-branch-notes branch May 14, 2020 13:25
@saschagrunert
Copy link
Member Author

saschagrunert commented May 14, 2020

Hm, I'll cherry-pick manually

@saschagrunert saschagrunert mentioned this pull request May 14, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mrunalp mrunalp Awaiting requested review from mrunalp mrunalp is a code owner

@runcom runcom Awaiting requested review from runcom runcom is a code owner

@giuseppe giuseppe Awaiting requested review from giuseppe

@rhatdan rhatdan Awaiting requested review from rhatdan

@sameo sameo Awaiting requested review from sameo

@sboeuf sboeuf Awaiting requested review from sboeuf

Assignees

@haircommander haircommander

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/feature Categorizes issue or PR as related to a new feature. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@saschagrunert @openshift-ci-robot @TomSweeneyRedHat @haircommander @openshift-cherrypick-robot @openshift-merge-robot