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 Mac CI #690

Merged
merged 6 commits into from
Mar 12, 2024
Merged

Fix Mac CI #690

merged 6 commits into from
Mar 12, 2024

Conversation

macumber
Copy link
Collaborator

@macumber macumber commented Mar 9, 2024

Fixes #689

@jmarrec I think the better approach would be to upload the new gmp recipe to NREL but I don't have permissions to do that. What do you think we should do?

@macumber macumber requested a review from jmarrec March 10, 2024 05:19
@jmarrec
Copy link
Collaborator

jmarrec commented Mar 11, 2024

$ conan search -r nrel gmp/6.2.1@ -rev
Revisions for 'gmp/6.2.1' at remote 'nrel':
2011237c81178d014a4c08ae40cfe0cb (2022-06-13 23:14:42 UTC)

This is the PR that fixed it: conan-io/conan-center-index#18447 so it's the 2023-07-10 revision.

$ conan search -r cci gmp/6.2.1@ -rev
Revisions for 'gmp/6.2.1' at remote 'cci':
560eab30a8f52beae2cef5ff26cdd61c (2023-10-25 09:20:17 UTC)
42ae2e6d353a772097058577e0e47004 (2023-08-23 08:16:15 UTC)
83f403337b343ce4530d1e9c5fb3dd68 (2023-07-10 17:27:47 UTC)
c0aec48648a7dff99f293870b95cad36 (2023-03-15 16:26:25 UTC)
9cd6e4a851f6ffd6ea5b5d563f23abcc (2023-01-21 03:36:22 UTC)
83b8f7a110976a83382f74bab17125fd (2022-12-31 10:46:48 UTC)
2011237c81178d014a4c08ae40cfe0cb (2022-02-25 08:13:28 UTC)

From what I can tell, it's no issue to bump to the latest revision. But I'll have to rebuild and host some binaries manually (for eg CCI doesn't have Visual Studio version 17 binaries)

Copy link
Collaborator

@jmarrec jmarrec left a comment

Choose a reason for hiding this comment

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

I suggest for now we make it global (same gmp on all platforms) with a TODO to remove the pinning once this is no longer needed

ConanInstall.cmake Outdated Show resolved Hide resolved
@jmarrec
Copy link
Collaborator

jmarrec commented Mar 11, 2024

Haha, of course windows refuses to build that gmp version. I'm tired of this stuff!

@jmarrec
Copy link
Collaborator

jmarrec commented Mar 12, 2024

Thanks @macumber

@jmarrec jmarrec merged commit 6ead472 into develop Mar 12, 2024
8 checks passed
@jmarrec jmarrec deleted the fix-mac-ci branch March 12, 2024 06:20
@github-actions github-actions bot locked and limited conversation to collaborators Mar 12, 2024
Comment on lines +45 to +49
if(WIN32)
set(CONAN_GMP "")
else()
set(CONAN_GMP "gmp/6.2.1#560eab30a8f52beae2cef5ff26cdd61c")
endif()
Copy link
Collaborator

Choose a reason for hiding this comment

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

Side note, but setting the variable to empty is unnecessary.

if(NOT WIN32)
  set(CONAN_GMP "gmp/....")
endif()

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

Successfully merging this pull request may close these issues.

Mac CI failing on GMP
2 participants