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

Update 'make gen' to minimize conflicts in generated files between main and release branches #303

Open
1 task done
FilipB opened this issue Aug 19, 2024 · 0 comments
Open
1 task done

Comments

@FilipB
Copy link
Collaborator

FilipB commented Aug 19, 2024

Is this the right place to submit this?

  • This is not a question about how to use the sail-operator

Feature Description

'make gen' is generating many different files based on 'versions.yaml'. As soon as we change 'versions.yaml' in a release branch and push changes, the automatic cherry-picker is failing because of conflict for any change touching those generated files. We should try to minimize those conflicts to avoid manual cherry-pick as much as possible.

Additional Information

No response

@FilipB FilipB added the enhancement New feature or request label Aug 19, 2024
@FilipB FilipB changed the title [FEATURE] Update 'make gen' to minimize conflicts in generated files between main and release branches Update 'make gen' to minimize conflicts in generated files between main and release branches Aug 21, 2024
@FilipB FilipB removed the enhancement New feature or request label Aug 21, 2024
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

No branches or pull requests

1 participant