search

eclipse-equinox / equinox.bundles

Eclipse Public License 2.0
8 stars 16 forks source link

Create equinox repo to merge equinox.bundles and equinox.framework into it #18

Open vogella opened 2 years ago

vogella commented 2 years ago

PMC decided that we will merge equinox.framework into the equinox.bundles repo. Thomas indicated that a better name would be equinox.

If @tjwatson give his +1 I can open a help ticket to rename the equinox.bundles Public repo to equinox.

I did this with GEF Legacy. See https://github.com/eclipse/gef-classic/issues/5

vogella commented 2 years ago

We are doing the same for PDE https://github.com/eclipse-pde/eclipse.pde.ui/issues/35

vogella commented 2 years ago

@tjwatson please approved. Worked well for pde.ui to pde

laeubi commented 2 years ago

@vogella @tjwatson any progress here? Will the merge happen after 2022-06 release?

HannesWell commented 2 years ago

@vogella @tjwatson any progress here? Will the merge happen after 2022-06 release?

That's the plan as far as I know. Renaming is planned after the merge with equinox.framework (https://github.com/eclipse-equinox/equinox.framework/issues/14) which is just waiting for https://github.com/eclipse-equinox/equinox.framework/pull/44. The latter is waiting for a release of felix-scr: https://github.com/eclipse-equinox/equinox.framework/pull/44#issuecomment-1139207420 But @tjwatson expressed the intention to perform the release soon.

laeubi commented 2 years ago

Why is any of those required to merge git repositories?

HannesWell commented 2 years ago

It is not required. @vogella probably just wanted to be so kind to avoid the extra work to re-create PRs. But its statement was from a time where more where open. One PR does not justify a longer delay. Maybe @tjwatson could give an ETA for the FELIX-SCR release? If that is not too far it would be nice to wait another week or so. :)

laeubi commented 2 years ago

It should be possible to simply push the PR to the new remote? But anyways we can wait if there is a ETA and we do not delay it one more release I think.

vogella commented 2 years ago

@tjwatson you stay very quit here :-) Can you share you go or no-go for the rename of the repo. We did it in PDE (pde.ui to pde) and IIRC we had no (or at least only little so I forgot them) issues with it.

tjwatson commented 2 years ago

Last discussion we had I thought we were leaving both repos as is and creating a new one called equinox to merge framework and bundles into. Then convert the existing repos to read-only with a final commit that removes everything except a readme pointing to the new repo.

vogella commented 2 years ago

Sounds good. Shall I open a help desk request to create a new repo or do you want to do this?

akurtakov commented 2 years ago

@vogella Please do so. We have to act as we are just spinning here while actual problems are pending and depend (in a way ) on that - https://github.com/eclipse-equinox/equinox.bundles/issues/54#issuecomment-1156018920

vogella commented 2 years ago

@vogella Please do so. We have to act as we are just spinning here while actual problems are pending and depend (in a way ) on that - #54 (comment)

https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/1416

vogella commented 2 years ago

@akurtakov done, and I pushed content of equinox.bundles to the new equinox repo. https://github.com/eclipse-equinox/equinox

Can someone update the aggegator build and close all pending PR of equinox-bundles? This process would be less disruptive if we renamed the old repo.

laeubi commented 2 years ago

@vogella what about the framework repo? Just in case we adjust the aggregator so no need for double work?

laeubi commented 2 years ago

@merks would you be so kind adjusting the setup (maybe after @vogella also moved the framework repo)

vogella commented 2 years ago

@vogella what about the framework repo? Just in case we adjust the aggregator so no need for double work?

@laeubi can you provide a merge PR for it?

merks commented 2 years ago

Yes, I've been following this thread and as soon as the framework repo is merged in I can merge the two setups.

akurtakov commented 2 years ago

From releng POV I would like to do the aggregator build changes once as we all have an agreement let's just act on it.

laeubi commented 2 years ago

Master build is running fine now: https://ci.eclipse.org/equinox/job/equinox/job/master/ so I would assume my part is done here :-)

merks commented 2 years ago

@laeubi So I should look to make the setup work now?

laeubi commented 2 years ago

At least everything from both repos is in, so from eclipse ide side we should be fine :+1:

laeubi commented 2 years ago

Just some usual statistic:

Previous build times where around 35 minutes we are now at around 30 minutes, so not that bad, but on a 16 CPU machine with parallel builds I could get a buildtime of the whole equinox of Total time: 09:33 min (Wall Clock) without any special optimization!

So if we are really concerned about build times we:

  1. use parallel builds as much as possible
  2. parallelize tests, in my run the test execution takes 08:03 min so if we can distribute and/or parallelize the execution this will has direct impact on the overall build time!
  3. ask EF Infra to cache maven downloads (it seems currently it downloads over and over again...)
  4. ask EF Infra to give us more CPU power on the executors