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

[Build] Assume new equinox.binaries repo name by default in scripts #641

Merged

Conversation

HannesWell
Copy link
Member

Because the repository containing the Equinox binaries is now named 'eclipse-equinox/equinox.binaries' its folder is, by default, named 'equinox.binaries' after cloning it.
In order to simplify contributions that name should be assumed by default.

Accordingly rename the property 'rt.equinox.binaries.loc' used in the build to 'equinox.binaries.loc'.

@tjwatson do you have any objections?

@HannesWell HannesWell requested a review from tjwatson June 9, 2024 15:44
@HannesWell HannesWell force-pushed the assume-equinox.binaries-name branch from 6a00839 to 813c57a Compare June 9, 2024 15:45
Copy link

github-actions bot commented Jun 9, 2024

Test Results

  660 files  ±0    660 suites  ±0   1h 12m 9s ⏱️ +23s
2 195 tests ±0  2 148 ✅ ±0   47 💤 ±0  0 ❌ ±0 
6 729 runs  ±0  6 586 ✅ ±0  143 💤 ±0  0 ❌ ±0 

Results for commit f50795c. ± Comparison against base commit 343e816.

♻️ This comment has been updated with latest results.

Copy link
Contributor

@tjwatson tjwatson left a comment

Choose a reason for hiding this comment

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

LGTM

@laeubi
Copy link
Member

laeubi commented Jun 10, 2024

Launcher test now fail

Supplied equinox binaries location does not exist: D:\a\equinox\equinox\rt.equinox.binaries
java.lang.IllegalArgumentException: Supplied equinox binaries location does not exist: D:\a\equinox\equinox\rt.equinox.binaries
	at org.eclipse.equinox.launcher.tests.LauncherTests.prepareLauncherSetup(LauncherTests.java:93)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.base/java.lang.reflect.Method.invoke(Method.java:568)

@HannesWell
Copy link
Member Author

HannesWell commented Jun 10, 2024

When this is submitted we should also adapt the paths in
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/81db9931a45fdbae03b9128f3cd30a791749d831/.gitmodules#L29-L31

and all other references the releng.aggregator repository.

HannesWell added a commit to HannesWell/eclipse.platform.releng.aggregator that referenced this pull request Jun 12, 2024
Adapt to the name changed assumption about the default name in equinox.
See eclipse-equinox/equinox#641
HannesWell added a commit to HannesWell/eclipse.platform.releng.aggregator that referenced this pull request Jun 12, 2024
Adapt to the name changed assumption about the default name in equinox.

See eclipse-equinox/equinox#641
@HannesWell
Copy link
Member Author

When this is submitted we should also adapt the paths in https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/81db9931a45fdbae03b9128f3cd30a791749d831/.gitmodules#L29-L31

and all other references the releng.aggregator repository.

This is now done with eclipse-platform/eclipse.platform.releng.aggregator#2128.

@HannesWell HannesWell force-pushed the assume-equinox.binaries-name branch 4 times, most recently from 08602b7 to 70ee8f5 Compare June 13, 2024 18:14
Because the repository containing the Equinox binaries is now named
'eclipse-equinox/equinox.binaries' its folder is, by default, named
'equinox.binaries' after cloning it.
In order to simplify contributions that name should be assumed by
default.

Accordingly rename the property 'rt.equinox.binaries.loc' used in the
build to 'equinox.binaries.loc'.
@HannesWell HannesWell force-pushed the assume-equinox.binaries-name branch from 70ee8f5 to f50795c Compare June 13, 2024 18:54
@HannesWell
Copy link
Member Author

Finally the build is green (besides the usual TCK failure), so lets submit this.

@HannesWell HannesWell merged commit 23627e1 into eclipse-equinox:master Jun 13, 2024
26 of 27 checks passed
@HannesWell HannesWell deleted the assume-equinox.binaries-name branch June 13, 2024 20:09
HannesWell added a commit to HannesWell/eclipse.platform.releng.aggregator that referenced this pull request Jun 13, 2024
Adapt to the name changed assumption about the default name in equinox.

See eclipse-equinox/equinox#641
HannesWell added a commit to eclipse-platform/eclipse.platform.releng.aggregator that referenced this pull request Jun 13, 2024
Adapt to the name changed assumption about the default name in equinox.

See eclipse-equinox/equinox#641
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.

3 participants