1. Mailing Lists
  2. Contributors
  3. Re: Proposal to support small repos into the current OCA workflow

Contributors mailing list archives

contributors@odoo-community.org

Browse archives

SEO improvements Odoo: The 6 important SEO features should be improved in Odoo 9 or Odoo 10 #12527

Re: Proposal for new workflow, incorporating "Optimistic Merging"

Avatar

Re: Proposal to support small repos into the current OCA workflow

by
ClosingAp Open Source Integrators Europe, LDA, Daniel Reis
- 22/06/2016 14:20:19

Hello all,

I conducted a first experiment on this workflow.

GitHub only allows to create PRs from forked repositories.
So the proposal to integrate a new repo needs to be done differently.

My idea is to keep a "oca_modules.txt" file in the integration repos, similar to the existing "oca_dependencies.txt".
This file lists the satellite repos to integrate in the reference repo.
A nightly script would perform, for each line, the following command:

    git merge -X ours https://github.com/OCA/$SATELLITE_REPO -b $BRANCH

The "ours" merge strategy keeps the integration repo top level dotfiles (.travis.yml, README, .gitignore, CONTRUBUTING.md, etc).

So, proposing to add a new repo should be creating PR to add a line to the "oca_modules.txt" file.
To follow the changes and discussion, people need to manually follow the proposed repository.
The best the author can do is to later post  reminders on this PR if it needs more people to come into the discussion.

I couldn't test the ownership transfer to the OCA, but it seems that the original owner should add the OCA organization as owner ,and then remove himself: https://help.github.com/articles/transferring-organization-ownership/


After this, we could merge the PR adding the repo to the "oca_modules.txt" file.
It would be desirable to be able to confirm that integrating the new repo would keep TravisCI green.
For this, we should improve the MQT, so that it merges the proposed repo and lets us see how the tests work after the merge.
The git-subrepo extension could be helpful here, but I worry if it supports merge strategies, since the "-X ours" is really necessary.


Sounds good?
I would like to start an experiment on OCA/project, and already have an idea for the candidate repo.


Regards
/DR


Citando Graeme Gellatly <gdgellatly@gmail.com>:

Hi,

At airport so can't elaborate but take a look at https://github.com/ingydotnet/git-subrepo#readme. Then you can have atomic repos, aggregate ones, ppl just working on what they need, distribution repos etc. Tbh I've not used this yet, but did use git subtree which worked really well.

 
On Mon, 20 Jun 2016 3:53 AM Daniel Reis <dgreis@sapo.pt> wrote:
 

Just a tiny comment: Would it be bad to suggest a OCA-dev organization? This prevent's cluttering the actual nicly organized repos. Yet this might be a technical detail and you already conceived it that way. 

Indeed, an OCA-dev org could provide a nice sandbox for contributors to collaborate.
But crowd discussions are hard, and it's best to keep the discussion topic narrow and focused.
I believe that it is something we can bring up at a later time.
 
/Daniel
 

_______________________________________________
Mailing-List: http://odoo-community.org/groups/contributors-15
Post to: mailto:contributors@odoo-community.org
Unsubscribe: http://odoo-community.org/groups?unsubscribe

_______________________________________________
Mailing-List: http://odoo-community.org/groups/contributors-15
Post to: mailto:contributors@odoo-community.org
Unsubscribe: http://odoo-community.org/groups?unsubscribe


 

Reference