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 the Windows MSVC build #115

Merged
merged 5 commits into from
Oct 27, 2023
Merged

Fix the Windows MSVC build #115

merged 5 commits into from
Oct 27, 2023

Conversation

KarelPeeters
Copy link
Contributor

Fixes #114, also has some other small improvements.

Depends on scipopt/scip-sys#4 to actually fully build on windows, so maybe a version bump of the sys crate and a corresponding change in this Cargo.toml is necessary.

…ally underlying u32.

This fixes the build on Windows MSVC, where enums are represented as i32 instead.
* The file itself is moved into an ignored data directory, so it never shows up in VCS.
* The model is dropped before deleting the file, so it can be deleted (this is important on Windows).
@codecov
Copy link

codecov bot commented Oct 26, 2023

Codecov Report

Merging #115 (3e87e7e) into main (cc34f3d) will increase coverage by 0.35%.
The diff coverage is 100.00%.

❗ Current head 3e87e7e differs from pull request most recent head 693164a. Consider uploading reports for the commit 693164a to get more accurate results

@@            Coverage Diff             @@
##             main     #115      +/-   ##
==========================================
+ Coverage   74.61%   74.96%   +0.35%     
==========================================
  Files          13       13              
  Lines        1729     1725       -4     
==========================================
+ Hits         1290     1293       +3     
+ Misses        439      432       -7     
Files Coverage Δ
src/branchrule.rs 93.88% <ø> (ø)
src/heuristic.rs 100.00% <ø> (ø)
src/model.rs 89.59% <100.00%> (+0.07%) ⬆️
src/pricer.rs 92.73% <ø> (ø)
src/status.rs 88.10% <100.00%> (ø)
src/variable.rs 81.82% <100.00%> (ø)

... and 1 file with indirect coverage changes

@mmghannam
Copy link
Member

Thanks a lot for your contribution! could you please also update the CHANGELOG.md?

@mmghannam
Copy link
Member

I added a new version (0.1.5) of scip-sys with your change and updated the version number here.

@KarelPeeters
Copy link
Contributor Author

I hope I added that to the right section of the changelog 😅 .

@mmghannam
Copy link
Member

I hope I added that to the right section of the changelog 😅 .

Yeah, it's always a philosophical dilemma for me too 😄 Thanks again @KarelPeeters!

@mmghannam mmghannam merged commit 3e2c6a9 into scipopt:main Oct 27, 2023
@KarelPeeters
Copy link
Contributor Author

Thanks for the quick merges!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

russcip fails to compile on Windows MSVC: u32 != i32
2 participants