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

Question: using with GitLab and Bitbucket #87

Closed
ivs-cetmix opened this issue Jan 4, 2025 · 5 comments
Closed

Question: using with GitLab and Bitbucket #87

ivs-cetmix opened this issue Jan 4, 2025 · 5 comments

Comments

@ivs-cetmix
Copy link

First of all thank you for the great tool!

There is an example for Gihub:

./product_attribute:
    remotes:
        oca: https://github.com/OCA/product-attribute.git
        acsone: git+ssh://git@github.com/acsone/product-attribute.git
    merges:
        - oca 8.0
        - oca refs/pull/105/head
        - oca refs/pull/106/head

Is there something similar for GitLab and Bitbucket merge requests?

@legalsylvain
Copy link

I guess you can put gitlab url or other. this file looks agnostic : https://github.com/acsone/git-aggregator/blob/master/git_aggregator/repo.py

See exemple : https://gitlab.com/grap-rhone-alpes/watchghost-aggregator/-/blob/master/repos.yml?ref_type=heads#L1

Note : except git-aggregate show-closed-prs thare are calling github api (https://github.com/acsone/git-aggregator/blob/master/git_aggregator/repo.py#L355)

Feel free to update documentation, once you'll find complete syntax.

thanks !

@ivs-cetmix
Copy link
Author

Thank you very much @legalsylvain !
Will check this 👍

@ivs-cetmix
Copy link
Author

So here is what I've managed to find out:

  1. Gitlab does support fetching MRs 👍
  2. Bitbucket doesn't 👎 You need to fetch branch instead or perform some weird tricks with fetching git patches and running a set of local commands. Which is not the case with git-aggregator.

Below is the file I generated based on that knowledge, hope it can help anyone.

# This file is generated with Cetmix Tower for git-aggregator tool developed by Acsone.
# Detailed information about git-aggregator and how to use it: https://github.com/acsone/git-aggregator 

./odoo_mexico:
  remotes:
    remote_1: https://salomaininen@bitbucket.org/moylop260/odoo-mexico.git
    remote_2: git@bitbucket.org:moylop260/odoo-mexico-fork.git
  merges:
  - remote: remote_1
    ref: master
  - remote: remote_2
    ref: 7.0-pr1-test
  target: remote_1
./gitaly:
  remotes:
    remote_1: https://gitlab.com/gitlab-org/gitaly.git
    remote_2: https://gitlab.com/gitlab-org/gitaly.git
  merges:
  - remote: remote_1
    ref: 70083d3baf2680dddf400d2a0d21a1d1b7043790
  - remote: remote_2
    ref: merge-requests/7550/head
  target: remote_1

@legalsylvain
Copy link

Thanks !
Could you make a PR to add that information in the readme ?
Could be usefull.

@ivs-cetmix
Copy link
Author

Thanks ! Could you make a PR to add that information in the readme ? Could be usefull.

@legalsylvain absolutely! Here it is: #88

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