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.

Sign up for GitHub

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

Jump to bottom

[SofaGraphComponent] FIX SceneCheck build on MacOS #719

Merged
merged 2 commits into from
Jul 23, 2018
Merged

[SofaGraphComponent] FIX SceneCheck build on MacOS #719

merged 2 commits into from
Jul 23, 2018

Conversation

guparan
Copy link
Contributor

@guparan guparan commented Jul 16, 2018 •
edited
Loading

CI info: I disabled Defrost MacOS builder to force this PR to build on sofa-ci-dev-macos.

To be merged asap (if CI agrees).

This PR:

  • builds with SUCCESS for all platforms on the CI.
  • does not generate new warnings.
  • does not generate new unit test failures.
  • does not generate new scene test failures.
  • does not break API compatibility.
  • is more than 1 week old (or has fast-merge label).

Reviewers will merge only if all these checks are true.

@guparan guparan added pr: fix Fix a bug pr: fast merge Minor change that can be merged without waiting for the 7 review days labels Jul 16, 2018
@guparan
Copy link
Contributor Author

guparan commented Jul 16, 2018

[ci-build]

@guparan
Copy link
Contributor Author

guparan commented Jul 16, 2018

Build failed with old error already seen in build 220.

@hugtalbot hugtalbot added the pr: status to review To notify reviewers to review this pull-request label Jul 16, 2018
@epernod
Copy link
Contributor

epernod commented Jul 17, 2018

[ci-build]

just testing if the problem is due to the lib.
Will rebase if not.

@guparan
Copy link
Contributor Author

guparan commented Jul 17, 2018

Well done @epernod !

@guparan
Copy link
Contributor Author

guparan commented Jul 17, 2018

Could someone test if the AdvancedTimer is still working correctly with the new nlohmann_json version?
@jnbrunet @fredroy @damienmarchal ?

@epernod
Copy link
Contributor

epernod commented Jul 17, 2018

No regression test on the advanceTimer? ;)

@guparan guparan added pr: status ready Approved a pull-request, ready to be squashed and removed pr: status to review To notify reviewers to review this pull-request labels Jul 20, 2018
@guparan
Copy link
Contributor Author

guparan commented Jul 20, 2018

Ready to merge.

@epernod
Copy link
Contributor

epernod commented Jul 20, 2018

green green green!!!

@epernod
Copy link
Contributor

epernod commented Jul 20, 2018

[ci-build][with-scene-tests]

@epernod epernod merged commit d7ccf3c into sofa-framework:master Jul 23, 2018
@guparan guparan deleted the fix_scenecheck_macos_build branch October 1, 2018 14:09
@guparan guparan added the pr: backport done This PR has been backported into the release before its milestone. label Oct 4, 2018
@guparan guparan added this to the v18.06 milestone Oct 4, 2018
guparan pushed a commit to guparan/sofa that referenced this pull request Oct 4, 2018
@epernod @guparan
Merge pull request sofa-framework#719 from guparan/fix_scenecheck_mac…
82656dd 
…os_build

[SofaGraphComponent] FIX SceneCheck build on MacOS
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
pr: backport done This PR has been backported into the release before its milestone. pr: fast merge Minor change that can be merged without waiting for the 7 review days pr: fix Fix a bug pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Milestone
v18.06
Development

Successfully merging this pull request may close these issues.
3 participants
@guparan @epernod @hugtalbot