-
Notifications
You must be signed in to change notification settings - Fork 44
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
feat: Update bundled resources/INSPIRE presets used in hale studio #1069
Conversation
@kapil-agnihotri Do you have any idea what the cause of the build failure is? |
Not sure about the root cause but it might be related to Tycho version. We may try to update the Tycho version to the next one maybe? @emanuelaepure10 does it also fails in your local system if you run |
The build log can be quite confusing, since there are some errors that seem to be normal.
|
I looked at the related MANIFEST.MF - it seems to miss the version for the exported package:
Compared to that the Manifest for the previous version of the bundle:
This problem likely did not surface in Eclipse because the bundle version stayed the same and Eclipse may have used the old cached version. |
@emanuelaepure10 You could try with the changes here: halestudio/hale-platform#51 When testing locally it added package exports to the JAXB bundles including the version as expected. |
953a14e
to
5dc8844
Compare
Running the script locally I got a build successful. |
@stempler I have used halestudio/hale-platform#51 to recreate the updatesite |
@emanuelaepure10 It seems you only updated the commit sha in the target platform file, not the version of the platform feature. |
platform/hale-platform.target
Outdated
<repository location="https://gitlab.wetransform.to/hale/hale-build-support/raw/d6435ab10b4a5cab971d1d7839c95b590542b662/updatesites/platform"/> | ||
<unit id="eu.esdihumboldt.hale.platform.feature.group" version="4.1.0.i20230505"/> | ||
<repository location="https://gitlab.wetransform.to/hale/hale-build-support/raw/e9436fa1b3c40b216f01daf20c3f21085e43b235/updatesites/platform"/> | ||
<unit id="eu.esdihumboldt.hale.platform.feature.group" version="5.0.0.i20231025"/> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@emanuelaepure10 I mean this. My guess is you only updated the commit sha after the last change but not the version of the platform feature to reflect whatever version is present in that update site.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see. somehow I forgot to push. I just did it now. Let's see the results :-)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any idea how to solve this
Cannot resolve project dependencies:
Software being installed: eu.esdihumboldt.hale.app.cli.commands 5.1.0.qualifier
Missing requirement: eu.esdihumboldt.hale.common.align 5.1.0.qualifier requires 'osgi.bundle; com.vladsch.flexmark 0.64.0' but it could not be found
Cannot satisfy dependency: eu.esdihumboldt.hale.app.cli.commands 5.1.0.qualifier depends on: osgi.bundle; eu.esdihumboldt.hale.common.align 2.9.5
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The update site does not contain this bundle. See for instance the content of the related artifacts.jar (the XML file lists all plugins in the update site).
I guess you
- Did the platform generation either w/o custom Eclipse home or w/o removing the old eclipse artifact (see last sentence on this comment)
- Did not test the update site in Eclipse with hale studio or forgot to take measures that the new update site is used in Eclipse despite mostly no version changes on the bundles
- After running the script to update hale-build-support ignored the deleted files and did not commit the deletions
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@stempler I have probably missed this comment
In version 3 I changed the default eclipse artifact that is downloaded from the minimal eclipse product to a full Eclipse 2023-09. For this to be picked up you need to clear the folder .gradle/bnd-platform/ in your home directory.
I somehow don't have a .gradle/bnd-platform/ folder
Why I don't have it? What should I do to have it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For this to be picked up you need to clear the folder
.gradle/bnd-platform/
in your home directory.
In your home directory / user home.
In a *nix shell it would be the folder ~
, if you use a Windows shell there seems to be a variable %USERPROFILE%
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@stempler @kapil-agnihotri
Please tell me what in this workflow is wrong or what is missing:
- clean
.gradle/bnd-platform/
- move to
master ``https://github.com/halestudio/hale-platform
2.1. changeeclipseHome
2.1.0. I don't run./gradlew -p modules/resources
because it was done by @stempler in a previous PR merged into the master and for me this fails
2.2. run./gradlew
2.3. run./update-build-support.sh
- create PR for hale-platform-update with the changes in updatesite
- create PR for hale-platform with the version-history.json
- in hale plugin platform
5.1. go tohale-platform.target
update location repository with the commit from hale-platform-update.
5.2. reload locations and reload target platform
5.3. validateHALE.product
5.4. commit the changes
Thank you
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change eclipseHome
This ideally should not be required, but as we found out with some Eclipse versions, including the one used by bnd-platform for some years, when running the update site creation there are bundles missing.
We changed the default artifact that is downloaded to one that works, but it does not automatically replace any previous downloaded artifact. Thus the cleanup in ~/.gradle/bnd-platform/
.
run ./update-build-support.sh
Ideally before doing that test the update site within Eclipse using a file URL to the built update site in the file system. Eclipse has some caching mechanisms that can be hindering in such cases, so it is recommended to first rename the update site folder to something unique (e.g. append date and a counter).
After testing and then updating the build-support repo via the script, all changes in build-support should be added to the commit. If there are unexpected changes, e.g. bundles removed but not replaced or very many changes even though only a few are expected, something could be going wrong and it makes sense to check/investigate.
3ad4084
to
1c164a8
Compare
Update the location with the new updatesites https://gitlab.wetransform.to/hale/hale-build-support/commit/31200fbaed9428152f7886da3e0e11d5a9870974 to 10a1542203078a6afa14954ef0607e2f6b651544 ING-3236
1c164a8
to
b93cc05
Compare
Replaced by #1071 |
Update the location with the new updatesites https://gitlab.wetransform.to/hale/hale-build-support/commit/31200fbaed9428152f7886da3e0e11d5a9870974
ING-3236