Skip to content

Improve emscripten llvm build in ci #384

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged

Conversation

mcbarton
Copy link
Collaborator

@mcbarton mcbarton commented Dec 7, 2024

Description

Please include a summary of changes, motivation and context for this PR.

This PR should make the emscripten build of llvm we make in the ci match that in Emscripten forge.

Fixes # (issue)

Type of change

Please tick all options which are relevant.

  • Bug fix
  • New feature
  • Requires documentation updates

Testing

Please describe the test(s) that you added and ran to verify your changes.

Checklist

  • I have read the contribution guide recently

@mcbarton mcbarton force-pushed the Fix-llvm-build-for-emscripten branch 2 times, most recently from 44e77bc to bf6a1dd Compare December 8, 2024 00:17
@mcbarton mcbarton marked this pull request as draft December 8, 2024 00:36
@anutosh491
Copy link
Collaborator

Hey @mcbarton I shall review this by tomorrow! Thanks

@mcbarton
Copy link
Collaborator Author

mcbarton commented Dec 8, 2024

@anutosh491 I'll cc you to review once its ready (hopefully i'll have it done by tomorrow). At the moment I am fixing issues with this PR.

Copy link

codecov bot commented Dec 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 70.62%. Comparing base (980b4b6) to head (8cb1e13).
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #384   +/-   ##
=======================================
  Coverage   70.62%   70.62%           
=======================================
  Files           9        9           
  Lines        3500     3500           
=======================================
  Hits         2472     2472           
  Misses       1028     1028           

@mcbarton mcbarton force-pushed the Fix-llvm-build-for-emscripten branch from e4390eb to 7e407fa Compare December 8, 2024 22:40
@mcbarton mcbarton force-pushed the Fix-llvm-build-for-emscripten branch 6 times, most recently from d4d43cf to 436827e Compare December 11, 2024 19:12
@@ -1385,4 +1628,4 @@ jobs:
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
-DCppInterOp_DIR="${{ env.CPPINTEROP_BUILD_DIR }}/lib/cmake/CppInterOp" \
..
Copy link
Collaborator

Choose a reason for hiding this comment

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

I see micromamba activate CppInterOp-wasm on line 1616

Probably that's not required. We would like to stay in the CppInterOp-wasm-build for this !

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The CppInterOp-wasm build is activate by default when you start an action because of here https://github.com/mcbarton/CppInterOp/blob/027cbb1fc65a39f4b2bb2d2b38fa21c8019b2b57/.github/workflows/ci.yml#L1528 .

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yeah what I meant is that activating cppinterop-wasm is not required here. We would like to stay in cppinterop-wasm-build

Copy link
Collaborator

Choose a reason for hiding this comment

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

I shall make the change in my PR as this is more relevant to the shared build.

@anutosh491
Copy link
Collaborator

Also you could get rid of the zlib changes now !

@mcbarton mcbarton force-pushed the Fix-llvm-build-for-emscripten branch 2 times, most recently from ce0ad5e to f025f32 Compare December 12, 2024 08:02
@mcbarton mcbarton changed the title Make emscripten llvm build match that of emscripten forge Improve emscripten llvm build in ci Dec 12, 2024
@mcbarton mcbarton added the ci CI workflows label Dec 12, 2024
@mcbarton mcbarton force-pushed the Fix-llvm-build-for-emscripten branch from 2bf383f to 8cb1e13 Compare December 12, 2024 15:49
Copy link
Collaborator

@anutosh491 anutosh491 left a comment

Choose a reason for hiding this comment

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

This looks good to me now !

@mcbarton mcbarton marked this pull request as ready for review December 12, 2024 16:21
@mcbarton mcbarton merged commit 7038fe7 into compiler-research:main Dec 12, 2024
42 of 45 checks passed
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
ci CI workflows
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants