-
Notifications
You must be signed in to change notification settings - Fork 204
CI macOS #867
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
base: master
Are you sure you want to change the base?
CI macOS #867
Conversation
CMakeLists.txt
Outdated
@@ -97,7 +97,7 @@ if (DOWNLOAD_GMP) | |||
INTERFACE_INCLUDE_DIRECTORIES "${INSTALL_DIR}/include") | |||
add_dependencies(GMP::GMP gmp) | |||
else() | |||
find_package(GMP) | |||
find_package(GMP REQUIRED) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Required is missing here on purpose to provide a nicer error message, please drop this change.
Thanks for the comments, I will fix this later today. |
9d9486f
to
3af3798
Compare
3af3798
to
5785365
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks pretty good to me. Just a few minor comments.
@@ -18,6 +18,7 @@ target_include_directories(sail_runtime | |||
PUBLIC "${sail_dir}/lib" | |||
) | |||
target_compile_options(sail_runtime PRIVATE -Wno-extra -Wno-unused) | |||
target_link_libraries(sail_runtime PUBLIC GMP::GMP) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think with this here you can remove GMP::GMP
from here:
target_link_libraries(riscv_sim_${arch}
PRIVATE softfloat sail_runtime default_config GMP::GMP
)
.github/workflows/compile.yml
Outdated
if: startsWith(matrix.os, 'macos-') && steps.opam-cache.outputs.cache-hit != 'true' | ||
run: | | ||
opam init --auto-setup --bare | ||
opam switch create default 4.14.1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably could use OCaml 5 here?
.github/workflows/compile.yml
Outdated
opam switch create default 4.14.1 | ||
eval $(opam env) | ||
opam update | ||
opam install -y sail |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should lock the version (don't ask me how!).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
opam install -y sail.0.19
should work.
20cb907
to
f435677
Compare
f435677
to
bbbf159
Compare
Fixed macOS compilation issue and added to CI