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

Failure to cherrypick changelog back to master #439

Closed
daviddavis opened this issue Jul 7, 2021 · 1 comment · Fixed by #441
Closed

Failure to cherrypick changelog back to master #439

daviddavis opened this issue Jul 7, 2021 · 1 comment · Fixed by #441

Comments

@daviddavis
Copy link
Contributor

We encountered a problem when releasing 3.14.1 when trying to cherrypick the changelog back to master:

https://github.com/pulp/pulpcore/runs/3011763886?check_suite_focus=true#step:23:37

I believe the problem is that due to a z-stream release, the changelog commit is referencing (and trying to remove) changelog files that don't exist on master. For example, there's CHANGES/9015.bugfix which is the 3.14.1 backport of CHANGES/9003.bugfix.

@daviddavis
Copy link
Contributor Author

I started a related discussion here: https://github.com/pulp/community/discussions/50.

dkliban added a commit to dkliban/plugin_template that referenced this issue Jul 12, 2021
dkliban added a commit to dkliban/plugin_template that referenced this issue Jul 12, 2021
dkliban added a commit to dkliban/plugin_template that referenced this issue Jul 12, 2021
dkliban added a commit that referenced this issue Jul 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

1 participant