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

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

Open
vogella opened this issue Apr 20, 2022 · 22 comments
Open
Assignees

Comments

@vogella
Copy link
Contributor

vogella commented Apr 20, 2022

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 eclipse/gef-classic#5

@vogella
Copy link
Contributor Author

vogella commented Apr 22, 2022

We are doing the same for PDE eclipse-pde/eclipse.pde#35

@vogella
Copy link
Contributor Author

vogella commented Apr 28, 2022

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

@laeubi
Copy link
Member

laeubi commented Jun 5, 2022

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

@HannesWell
Copy link
Member

@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 (eclipse-equinox/equinox.framework#14) which is just waiting for eclipse-equinox/equinox.framework#44. The latter is waiting for a release of felix-scr: eclipse-equinox/equinox.framework#44 (comment)
But @tjwatson expressed the intention to perform the release soon.

@laeubi
Copy link
Member

laeubi commented Jun 5, 2022

Why is any of those required to merge git repositories?

@HannesWell
Copy link
Member

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
Copy link
Member

laeubi commented Jun 5, 2022

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
Copy link
Contributor Author

vogella commented Jun 14, 2022

@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
Copy link
Contributor

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
Copy link
Contributor Author

vogella commented Jun 14, 2022

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

@akurtakov
Copy link
Member

@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)

@akurtakov akurtakov changed the title Rename equinox.bundles repo to equinox Create equinox repo to merge equinox.bundles and equinox.framework into it Jun 15, 2022
@vogella
Copy link
Contributor Author

vogella commented Jun 15, 2022

@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
Copy link
Contributor Author

vogella commented Jun 15, 2022

@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
Copy link
Member

laeubi commented Jun 15, 2022

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

@laeubi
Copy link
Member

laeubi commented Jun 15, 2022

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

@vogella
Copy link
Contributor Author

vogella commented Jun 15, 2022

@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
Copy link
Contributor

merks commented Jun 15, 2022

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

@akurtakov
Copy link
Member

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
Copy link
Member

laeubi commented Jun 16, 2022

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
Copy link
Contributor

merks commented Jun 16, 2022

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

@laeubi
Copy link
Member

laeubi commented Jun 16, 2022

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

akurtakov added a commit to akurtakov/eclipse.platform.releng.aggregator that referenced this issue Jun 16, 2022
Switches aggregator build to use the new merged equinox repository
instead of the old split ones.
See eclipse-equinox/equinox.bundles#18
akurtakov added a commit to akurtakov/eclipse.platform.releng.aggregator that referenced this issue Jun 16, 2022
Switches aggregator build to use the new merged equinox repository
instead of the old split ones.
See eclipse-equinox/equinox.bundles#18
akurtakov added a commit to akurtakov/eclipse.platform.releng.aggregator that referenced this issue Jun 16, 2022
Switches aggregator build to use the new merged equinox repository
instead of the old split ones.
See eclipse-equinox/equinox.bundles#18
akurtakov added a commit to eclipse-platform/eclipse.platform.releng.aggregator that referenced this issue Jun 16, 2022
Switches aggregator build to use the new merged equinox repository
instead of the old split ones.
See eclipse-equinox/equinox.bundles#18
akurtakov added a commit to akurtakov/eclipse.platform.releng.aggregator that referenced this issue Jun 16, 2022
@laeubi
Copy link
Member

laeubi commented Jun 16, 2022

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

sravanlakkimsetti added a commit to sravanlakkimsetti/eclipse.platform.releng.aggregator that referenced this issue Jun 16, 2022
Create new equinox submodule and remove older split bundles
See eclipse-equinox/equinox.bundles#18
sravanlakkimsetti added a commit to eclipse-platform/eclipse.platform.releng.aggregator that referenced this issue Jun 16, 2022
Create new equinox submodule and remove older split bundles
See eclipse-equinox/equinox.bundles#18
akurtakov pushed a commit to akurtakov/eclipse.platform.releng.aggregator that referenced this issue Jun 16, 2022
Create new equinox submodule and remove older split bundles
See eclipse-equinox/equinox.bundles#18
akurtakov added a commit to eclipse-platform/eclipse.platform.common that referenced this issue Jun 16, 2022
laeubi pushed a commit to laeubi/eclipse.pde that referenced this issue Nov 2, 2023
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

6 participants