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

Leverage OSGi-DS component-xml file generation of PDE-DS/Tycho #661

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

HannesWell
Copy link
Member

@HannesWell HannesWell commented Aug 9, 2024

Remove all generated xml-files from git.

Especially the component-xml files are annoying since the state in git is not up to date. Consequently they are changed on each build and make the git staging dirty.
See https://gitlab.eclipse.org/eclipse-wg/ide-wg/community/-/issues/47#note_2617895

Copy link

github-actions bot commented Aug 9, 2024

Test Results

  660 files  +  660    660 suites  +660   1h 2m 3s ⏱️ + 1h 2m 3s
2 201 tests +2 201  2 046 ✅ +2 046   47 💤 + 47  0 ❌ ±0  108 🔥 +108 
6 747 runs  +6 747  6 268 ✅ +6 268  143 💤 +143  0 ❌ ±0  336 🔥 +336 

For more details on these errors, see this check.

Results for commit f320256. ± Comparison against base commit 773fe39.

♻️ This comment has been updated with latest results.

@HannesWell HannesWell force-pushed the remove-generated-component.xml branch from a80557c to 6aa7046 Compare August 10, 2024 08:25
@laeubi
Copy link
Member

laeubi commented Aug 11, 2024

The EventAdmin is currently not generated xml maybe better place that in a separate PR?

@HannesWell HannesWell force-pushed the remove-generated-component.xml branch from 6aa7046 to 4e75c19 Compare August 11, 2024 12:40
@HannesWell
Copy link
Member Author

The EventAdmin is currently not generated xml maybe better place that in a separate PR?

Yes, see #662.

Although the test failure was in equinox.ds.tests.

@HannesWell HannesWell force-pushed the remove-generated-component.xml branch 3 times, most recently from 1b665b3 to 04225a0 Compare August 11, 2024 13:43
@HannesWell
Copy link
Member Author

I really don't understand why the test is failing.
I could reproduce it locally when the component XML files are missing, but the logs say they are generated before the tests are executed?

@@ -1 +1,2 @@
/scr_test
OSGI-INF/org.eclipse.equinox.*.xml
Copy link
Member

@laeubi laeubi Aug 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
OSGI-INF/org.eclipse.equinox.*.xml
OSGI-INF/*.xml

Copy link
Member Author

@HannesWell HannesWell Sep 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reduced it now to OSGI-INF/org.eclipse.*.xml, but ignoring all XML could be too restrictive. And since in the fast majority of cases the classes in eclipse projects are in a org.eclipse... package this should be fine. And if not, one will notice it quickly and can adjust the pattern in that specific case.

@laeubi
Copy link
Member

laeubi commented Aug 11, 2024

I assume the problem is that the bundle is not packed before executed as a test and then the launcher looks for ${basedir}/OSGI-INF (that is empty) but the files are generated at ${basedir}/target/classes/OSGI-INF

@HannesWell HannesWell force-pushed the remove-generated-component.xml branch from 04225a0 to ddfd814 Compare September 19, 2024 23:13
@HannesWell
Copy link
Member Author

I assume the problem is that the bundle is not packed before executed as a test and then the launcher looks for ${basedir}/OSGI-INF (that is empty) but the files are generated at ${basedir}/target/classes/OSGI-INF

Yes. :/
I now remembered the work-around I implemented in eclipse-platform until this works out of the box:
https://github.com/eclipse-platform/eclipse.platform/pull/790/files#diff-899b68f39b8bdb3938d5d7807842a815c76276df4e51e7bad26f8272f55994bb

@HannesWell HannesWell force-pushed the remove-generated-component.xml branch from ddfd814 to bfbe06d Compare September 20, 2024 16:08
@HannesWell HannesWell force-pushed the remove-generated-component.xml branch from bfbe06d to 2de4b41 Compare September 22, 2024 21:29
Remove generated xml-files from equinox.ds.tests.
@HannesWell HannesWell force-pushed the remove-generated-component.xml branch from 2de4b41 to f320256 Compare September 23, 2024 20:28
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

Successfully merging this pull request may close these issues.

2 participants