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

Install sirius solver with VCPKG, remove antares-deps #2090

Merged
merged 61 commits into from
Jun 5, 2024
Merged

Install sirius solver with VCPKG, remove antares-deps #2090

merged 61 commits into from
Jun 5, 2024

Conversation

sylvlecl
Copy link
Member

@sylvlecl sylvlecl commented May 14, 2024 •
edited
Loading

Description

Continues the work of #2078 (which should be merged before in feature branch feature/vcpkg-dependencies), to push further the use of VCPKG, and in particular remove the need for the home-made antares-deps repository.

Hence, this includes:

  • Addition of sirius-solver "overlay" port to install sirius with VCPKG
  • Removal of antares-deps and associated code

sylvlecl added 30 commits May 2, 2024 08:58
@sylvlecl
VCPKG manifest mode with minizip and boost only, ubuntu
a5ace26 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Fix VCPKG install
a532ded 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
To be reverted: disable temporarily non-ununtu CIs
4d88b9f 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Fix toolchain file path
01c1719 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Fix wxWidgets search
ce6f0ee 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Revert boost from vcpkg for now
aaf56be 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Save cache even when build fails
8215e8c 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Fix cache key
ff51823 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Restore windows build
33541eb 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Fix vcpkg install
54d2717 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Try fixing toolchain path
4fa2567 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Try fiwing workspace path
ddf60fd 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Another try
82f866b 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Try improving cache logic
fb49715 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Add boost to windows build
c64b687 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Try with centos
a71f0ca 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
No VCPKG cache for centos, for now
1b19dfb 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Try to fix path to vcpkg
eeca546 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Log for debugging
bcb14cc 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Try install cmake with pip instead
64b59bb 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
More logs
8d996a1 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Temporarily disable ubuntu & windows
5e26bbd 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Try fix path
c6fa5b9 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Restore gcc install
3339c9e 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Again another try
e675c96 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Fix git version
9e426f8 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Fix packaging too
72f62ef 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Try oracle 8
b3de6f3 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Fix security error
cd23b2c 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Revert "Temporarily disable ubuntu & windows"
83331e0 
This reverts commit 5e26bbd.
@sylvlecl
VCPKG for sonar job
40a9f3b 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Merge branch 'feature/vcpkg-dependencies' into feature/vcpkg-linux
fd13a66
@sylvlecl
Support minizip dependency as minizip or minizip-ng
d4924c9 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Add ports for sirius-solver install with vcpkg
ca4caa4 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Remove antares-deps
b49f2dc 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Enable centos and OL8 workflows
ffa6f05 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Copy link
Member Author

Workflow failures are not related to this PR: centos and OL8 buils currently fail on develop (problem with boost version and with nodejs 20).

@sylvlecl sylvlecl marked this pull request as draft May 16, 2024 08:33
flomnes
flomnes approved these changes May 17, 2024
View reviewed changes
Copy link
Member

@flomnes flomnes left a comment

Choose a reason for hiding this comment

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

LGTM

src/packaging/Config.cmake.in Outdated
find_dependency(minizip-ng)
if (minizip-ng_FOUND)
Copy link
Member

Choose a reason for hiding this comment

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

This is already done in another PR

Base automatically changed from feature/vcpkg-linux to develop May 30, 2024 13:58
@sylvlecl
Merge remote-tracking branch 'origin/develop' into feature/vcpkg-siri…
4f783dc 
…us-port

Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Remove obsolete variable
f5a11df 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
WIP: doc
90fd54a 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Update developer documentation
3d837a0 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
More documentation fixes
ca1e655 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Few fixes
7a413f0 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl
Merge remote-tracking branch 'origin/develop' into feature/vcpkg-siri…
8411937 
…us-port

Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sylvlecl sylvlecl marked this pull request as ready for review June 3, 2024 14:43
@sylvlecl
Disable centos and oracle CI again
998f375 
Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Jun 3, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

@JasonMarechal25 JasonMarechal25 merged commit 5e6a57f into develop Jun 5, 2024
7 checks passed
@JasonMarechal25 JasonMarechal25 deleted the feature/vcpkg-sirius-port branch June 5, 2024 13:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flomnes flomnes flomnes approved these changes

@a-zakir a-zakir a-zakir approved these changes

Assignees
No one assigned
Labels
size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sylvlecl @flomnes @a-zakir @JasonMarechal25