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

Fix Travis (documentation deploy & DGtalTools) #1383

Merged
merged 1 commit into from
Jan 21, 2019

Conversation

rolanddenis
Copy link
Member

@rolanddenis rolanddenis commented Jan 16, 2019

PR Description

Update and fix of Travis script:

  • using classical environment variables (PATH, CPATH and CMAKE_PREFIX_PATH) instead of keeping path of each dependency.
  • calling script instead or sourcing it when possible.
  • chaining script lines so that it terminates if one step fails (but we loose the separate timings).
  • re-enabling DGtalTools compilation.
  • fixing documentation deploy.

Checklist

@rolanddenis rolanddenis changed the title Test travis [TEST] Test travis Jan 16, 2019
@rolanddenis rolanddenis changed the title [TEST] Test travis Fix Travis (documentation deploy & DGtalTools) Jan 18, 2019
Copy link
Member

@dcoeurjo dcoeurjo left a comment

Choose a reason for hiding this comment

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

thx for the cleanup;)


#Sequential DEC examples, this would also build library
#make examplePropagation
ninja testDiscreteExteriorCalculusExtended
#make exampleDiscreteExteriorCalculusChladni
ninja
ninja install
Copy link
Member

Choose a reason for hiding this comment

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

why do you need the install?

Copy link
Member Author

Choose a reason for hiding this comment

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

Thus (following the comment below), it is not necessary here since we don't use DGtal after this compilation. I only add this to copy the build_dgtal.sh script ... should I remove it ?

Copy link
Member

@dcoeurjo dcoeurjo Jan 19, 2019

Choose a reason for hiding this comment

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

If you don't mind...

Copy link
Member Author

Choose a reason for hiding this comment

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

😁

ninja
ninja install
Copy link
Member

Choose a reason for hiding this comment

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

same here

Copy link
Member Author

Choose a reason for hiding this comment

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

Because when compiling DGtalTools, I don't rely anymore on a DGtal_DIR variable but instead use CMAKE_PREFIX_PATH set to the dependency installation folder and let CMake find DGtal by itself. To be sure that files are at the good place, I have preferred to use the installation procedure (that also mimics what user may do to install DGtal).

Copy link
Member

Choose a reason for hiding this comment

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

👌 thx. it makes, sense.

@dcoeurjo
Copy link
Member

Thanks @rolanddenis , merging

@dcoeurjo dcoeurjo merged commit a1319cd into DGtal-team:master Jan 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants