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

Remove unknown recipes when syncing #43

Merged
merged 1 commit into from
Oct 24, 2023
Merged

Conversation

ajkavanagh
Copy link
Contributor

The lp-build-config has to be the last word in recipes for the repos/LP
projects that are managed as if a channel is moved from one branch to
another the old recipe will still be maintained resulting in two
recipes pushing to the same branch. This could lead to really weird
conflicts.

Thus, either charmed-openstack-info is the only metadata and controls
the repos automatically, or we need to remove the auto-syncing. I'm in
favour of the former, and so this change removes unknown (to
charmed-openstack-info) recipes when merging a change to the repos.

The lp-build-config has to be the last word in recipes for the repos/LP
projects that are managed as if a channel is moved from one branch to
another the *old* recipe will still be maintained resulting in two
recipes pushing to the same branch. This could lead to really weird
conflicts.

Thus, either charmed-openstack-info *is* the only metadata and controls
the repos automatically, or we need to remove the auto-syncing.  I'm in
favour of the former, and so this change removes unknown (to
charmed-openstack-info) recipes when merging a change to the repos.
Copy link
Member

@freyes freyes left a comment

Choose a reason for hiding this comment

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

Makes sense, this will be specially important as we deprecate branches.

@freyes freyes merged commit 53ce0c0 into main Oct 24, 2023
7 checks passed
@freyes freyes deleted the remove-unknown-when-auto-syncing branch October 24, 2023 19:49
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 this pull request may close these issues.

2 participants