Add support for the GeoEllipticalTube shape in I/O

added GeoModelIO GeoModelIOHelpers Tests labels

Hi @rbianchi, this MR has picked some conflicts. Could you please resolve them? Thanks

added 40 commits

5dafa5aa...ba58071a - 38 commits from branch main
77fcbcdc - Merge remote-tracking branch 'origin/main' into io-add-ellipticaltube-support
94cfb51b - Fix thread conflict with Virtual Surfaces

OK, I fixed all conflicts and updated

Once again, thanks @mbandier for reminding me about this long-waiting MR!

resolved all threads

Hi @rbianchi, I fixed the pipeline configuration in !384 (merged). Then I rebased !383 (merged) on the main and, as a result, we see the ubu-* jobs running there in the CI.

I could not do the same here, though. My attempt to rebase failed with: Rebase failed: Rebase locally, resolve all conflicts, then push the branch. Try again.. Could you please follow up on this? Thanks!

added 4 commits

94cfb51b...5eec2b27 - 3 commits from branch main
4473bf1f - Merge remote-tracking branch 'origin/main' into io-add-ellipticaltube-support

Compare with previous version

resolved all threads

@tsulaia , the Athena build fails with a git error:

error: could not apply 5dafa5aa... Add support for EllipticalTube shape in I/O
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 5dafa5aa... Add support for EllipticalTube shape in I/O
Auto-merging GeoModelIO/GeoModelWrite/src/WriteGeoModel.cpp
CONFLICT (content): Merge conflict in GeoModelIO/GeoModelWrite/src/WriteGeoModel.cpp

It seems that the Athena job does not succeed in applying the latest changes. So, it seems it's applying them on a pre-existing cache.

Do you know how we could delete that cache (if any)?

All the other jobs and tests ran fine.

Thanks, --Ric.

added 2 commits

9ae0b4f2 - 1 commit from branch main
fb6b0b09 - Merge remote-tracking branch 'origin/main' into io-add-ellipticaltube-support

Compare with previous version

added 3 commits

d1a00b59 - Add EllipticalTube example
d587215a - Add support for EllipticalTube shape in I/O
98edffee - Fix thread conflict with Virtual Surfaces

Compare with previous version

resolved all threads

added 1 commit

cb4e9f72 - Move visualization job to step A, bc now we don't build Coin and SoQt here

Compare with previous version

The pipeline and Athena tests were fine. Only the visualization job failed, but it was due to missing artifacts.

Actually, it's not due to code issues, which is fine. However, it is unclear why that job failed with that error message.

Artifacts get deleted after 24 hours, which is fine because it's what we set. So, if the job needed some artifacts from earlier steps, it failed.

But that job should not need any artifacts from earlier steps!

The job is a standalone build of the visualization package, which uses the -DGEOMODEL_BUILD_VISUALIZATION=1 CMake option at build time, so it should not depend on any other artifacts. Most of all, it should not depend on the Athena build.

While inspecting the CI setup, I also realized that the visualization job no longer needs to be launched at stage C. It was set to start in stage C because we built Coin and SoQt at stages A and B. But that's not the case anymore, and the pre-compiled Coin and SoQt libraries have been added to the container, so there is no need to start the visualization step at stage C anymore.

So, I moved it to stage A and restarted the pipeline.

Let's see if it completes successfully

resolved all threads

merged

Add support for the GeoEllipticalTube shape in I/O

Merge request reports

Activity