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

Generic IOC image generation should require main branch of ibek-support #17

Open
gilesknap opened this issue Nov 29, 2023 · 1 comment

Comments

@gilesknap
Copy link
Member

gilesknap commented Nov 29, 2023

This issue is about generic IOCs and therefore could be in https://github.com/epics-containers/ioc-template but I'm puting it here because it's really an issue with management of this repo.

Because ibek-support is a submodule of every generic IOC and submodule versions are defined by commit hash only, there is a very likely scenario that individual branches of the this repo will proliferate on a per-generic-IOC basis. The only motivation to merge into main is when you want to re-use changes to a support module definition in a different generic IOC. At that point you may be in a world of merge conflict pain. giles as already experienced this when he is the only person working on the repo at present.

@GDYendell has suggested the following fix.

  1. Change the generic IOC CI such that it will fail and not release push image to the container registry if it determines that the commit hash that it is using is NOT in the main branch. This therefore requires that the developer merges and pushes their changes before pushing the generic IOC source.
  2. Allow that this check is switched off if the generic IOC tag that kicked off the CI is a beta tag

@coretl care to comment on this?

@coretl
Copy link

coretl commented Nov 29, 2023

Sounds reasonable

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

2 participants