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

[tycho-4.0.x] Adopt new o.e.e.p2.publisher.eclipse API for IMacOsBundleUrlType #4249

Merged
merged 2 commits into from
Sep 11, 2024

Conversation

sratz
Copy link
Contributor

@sratz sratz commented Sep 10, 2024

Backport of #4246 + #4248

@sratz sratz changed the base branch from main to tycho-4.0.x September 10, 2024 15:45
@laeubi
Copy link
Member

laeubi commented Sep 11, 2024

@sratz I think we last release skipped this update due to some incompatibility for Tycho 4, so one needs probably other updates/bugfixes as well. I usually try to compare some things from main where the update was performed to see if something is missing or can be adapted.

@sratz
Copy link
Contributor Author

sratz commented Sep 11, 2024

@sratz I think we last release skipped this update due to some incompatibility for Tycho 4, so one needs probably other updates/bugfixes as well. I usually try to compare some things from main where the update was performed to see if something is missing or can be adapted.

I am wondering where to get started, though.

I don't have any idea what to make of the generic

org.apache.maven.it.VerificationException: Error in execution: [ERROR] [c8a6beaa-0a0d-4839-9687-0680bcd338fc][extension>org.eclipse.tycho:tycho-maven-plugin:4.0.9-SNAPSHOT] org.eclipse.equinox.p2.publisher.eclipse
at org.apache.maven.it.Verifier.verifyErrorFreeLog(Verifier.java:312)

error message that all tests are failing with :(

@laeubi
Copy link
Member

laeubi commented Sep 11, 2024

Yes that's a bit annoying as it hides the exception.

The easiest in such case is to do:

  • mvn clean install -T1C -DskipTests
  • cd tycho-its
  • mvn clean install -Pits -Dtest=<fqdn of test>

That way you can run one test and hopefully have access to everything (e.g. logs).

In this particular case, one can maybe better run

  • cd tycho-its/projects/reactor.makeBehaviour
  • mvn clean install -Dtycho-version=4.xx

to see the real error that is printed.

Copy link

github-actions bot commented Sep 11, 2024

Test Results

  597 files  ±0    597 suites  ±0   4h 14m 34s ⏱️ + 8m 30s
  418 tests ±0    411 ✅ +3   6 💤 ±0  0 ❌  - 2  1 🔥  - 1 
1 254 runs  ±0  1 234 ✅ +3  19 💤 ±0  0 ❌  - 2  1 🔥  - 1 

For more details on these errors, see this check.

Results for commit 01ec999. ± Comparison against base commit b30ba24.

♻️ This comment has been updated with latest results.

@sratz
Copy link
Contributor Author

sratz commented Sep 11, 2024

I updated all the P2 artifacts and their bouncycastle deps to be the same as in the main branch.

Looks pretty good and the one test failure on macOS seems unrelated.

Any concerns with this change?

@laeubi
Copy link
Member

laeubi commented Sep 11, 2024

This seem to happen sometimes and as it is only for one OS I think we would be fine with that. You might want to rebase to be totally sure or just merge and see what happens :-)

This is a precondition to use the new API provided with
eclipse-equinox/p2#533
and to properly support link handler registrations in macOS
product launchers.

More details:
eclipse-platform/eclipse.platform.ui#1901
After eclipse-tycho#4246, we can now consume the new

org.eclipse.equinox.internal.p2.publisher.eclipse.IProductDescriptor.getMacOsBundleUrlTypes()

API in the Tycho wrapper
org.eclipse.tycho.p2.tools.publisher.ExpandedProduct.

This is necessary to properly support link handler registrations in
product's launchers.

See
eclipse-platform/eclipse.platform.ui#1901
eclipse-equinox/p2#533
for more information.
@laeubi laeubi enabled auto-merge (rebase) September 11, 2024 15:22
@laeubi laeubi merged commit e3132df into eclipse-tycho:tycho-4.0.x Sep 11, 2024
9 of 11 checks passed
@sratz sratz deleted the 4.0.x-macos-bundleurltypes branch September 12, 2024 17:26
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