Skip to Content
  2. Mailing Lists
  3. Contributors
  4. Re: pandoc-*.deb cleaning in OCA repositories

Archives

Contributors

Re: pandoc-*.deb cleaning in OCA repositories

Re: pandoc-*.deb cleaning in OCA repositories

Re: pandoc-*.deb cleaning in OCA repositories

In my experience, and from what I can read, unreachable commits get garbage collected at some point and effectively disappear from GitHub.
This makes sense, for instance when you need to remove security sensitive stuff that would have been committed by accident.

This is the main drawback of any force push operation: 

Integrators who would have pinned commits posterior to the commit that added the .deb files will likely encounter errors at some point, 
and will have difficulties to recover code that is identical to what they have pinned.

The other attention point I see is that weblate will enter in conflict for all these branches.
This will require a manual operation to rebase or reset all affected branches in GitLab.
So if we do this, we must make sure people stop translating a few hours before the force push.

Regarding the repo size, I'm also not convinced we will gain that much in practice.
In OCA CI, action/checkout fetches the last commit only by default, and the OCA bot has a git cache, so the effect is probably negligible compared to everything else that is going on.
And since the Odoo ecosystem is used to wrestle a huge repo, a lot of folks have developed strategies to save bandwidth (shallow clones, git worktrees, etc).

Also, do we know what will happen to PR that have been created after the .deb commit?

So yeah, sorry for the mistake, happy to change my mind if anything I said above is wrong, but at this stage I'm not convinced this is worth the manual effort and downstream disturbances.

Best,

-Stéphane

On Mon, Jul 29, 2024 at 8:58 PM Pedro M. Baeza <notifications@odoo-community.org> wrote:
> I'm more concerned about commit history after the file merge. Nothing more.

Try this if you want:

- Do a pull request with a migration.
- Copy a permalink of something of the migration commit.
- git commit --amend and git push -f
- Open the previous permalink and it will work.

Anyway, the path of these branches is still very young, and it is better to do it as soon as possible (also for avoiding more and more clones).

Regards.

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

by Stéphane Bidoul - 12:51 - 31 Jul 2024

Reference

  • pandoc-*.deb cleaning in OCA repositories
    Due to a mistake on the tool to generate the READMES (fixed in [1]), some very big files ~30 MB each~ (with extension .deb or .dmg for Mac users) have been added both by the merge bot or by users doing a module migration.

    This makes that on branch/repository clonation, or any free pull operation on any local git repository copy (of any branch) wastes a lot of bandwidth and resources, and is not ecological friendly.

    Due to this, and although not ideal, we plan to force push the affected repositories (note that this has been only in 17.0 branches), following [3] technique recommended by Nils.

    The drawback of doing this is that your next `git pull` operations on that branches will fail, saying about unrelated commit histories or creating a merge commit with possible conflicts.

    The solution for avoiding it is to do the commands:

    git fetch origin 17.0
git reset --hard origin/17.0

    (being origin the OCA remote). In fact, this is the recommended way to do it in automated pulling systems.

    If you don't have any strong counter-arguments, I will perform it at the end of the week. I will announce here the affected repositories after the operation.

    Regards.

    by Pedro M. Baeza - 06:11 - 29 Jul 2024