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

[query] move mill modules into subdirectory #14772

Merged
merged 1 commit into from
Jan 24, 2025

Conversation

patrick-schultz
Copy link
Collaborator

@patrick-schultz patrick-schultz commented Dec 17, 2024

Change Description

To prepare for breaking the mill build up into more smaller modules, move all mill modules into a subdirectory, so as to not pollute hail/hail with a bunch of module directories.

Only 6 files are actually modified, the rest are just moved:

build.yaml
{src/main/c => c}/Makefile
hail/Makefile
hail/build.mill
hail/generate_splits.py
hail/python/test/hail/helpers.py

The moves were performed by

cd hail
mv src/main/c c
mv src/dist/scripts hail/dist/scripts
mv src/main/scala hail/src
mv src/main/java hail/src
mv src/main/resources hail/resources
mv src/debug/java hail/memory/debug/src
mv src/release/java hail/memory/release/src
mv src/test/scala hail/test/src
mv src/test/resources hail/test/resources

Security Assessment

  • This change has no security impact

Impact Description

Low-level refactoring of the build system and source directory structure

(Reviewers: please confirm the security impact before approving)

Copy link
Collaborator Author

patrick-schultz commented Dec 17, 2024

@patrick-schultz patrick-schultz force-pushed the ps-12-17-move_mill_modules_into_subdirectory branch from ab6e982 to f7dac2a Compare December 17, 2024 20:09
@patrick-schultz patrick-schultz force-pushed the ps-12-17-move_mill_modules_into_subdirectory branch from f7dac2a to 6c275c2 Compare December 17, 2024 20:37
hail/build.mill Outdated
@@ -126,6 +127,8 @@ trait HailScalaModule extends SbtModule with ScalafmtModule with ScalafixModule

object `package` extends RootModule with HailScalaModule { outer =>

override def millSourcePath: Path = super.millSourcePath / "modules"
Copy link
Member

Choose a reason for hiding this comment

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

an opportunity for hail/hail/hail

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Is this an actual request to change the name? I don't have any strong feelings one way or the other.

@patrick-schultz patrick-schultz force-pushed the ps-12-17-move_mill_modules_into_subdirectory branch from 6c275c2 to c291b9c Compare December 18, 2024 12:22
@ehigham ehigham force-pushed the ps-12-16-mill_update branch from 2b10d49 to d35b0d5 Compare December 18, 2024 15:53
@ehigham ehigham force-pushed the ps-12-17-move_mill_modules_into_subdirectory branch from c291b9c to 1147b2b Compare December 18, 2024 15:53
@patrick-schultz patrick-schultz force-pushed the ps-12-17-move_mill_modules_into_subdirectory branch from 1147b2b to c291b9c Compare December 18, 2024 16:05
@patrick-schultz patrick-schultz force-pushed the ps-12-17-move_mill_modules_into_subdirectory branch from c291b9c to 51abd7d Compare December 18, 2024 17:45
@ehigham ehigham force-pushed the ps-12-17-move_mill_modules_into_subdirectory branch from 51abd7d to 2b3a4af Compare December 18, 2024 18:19
@patrick-schultz patrick-schultz marked this pull request as ready for review December 18, 2024 18:25
Base automatically changed from ps-12-16-mill_update to main December 18, 2024 18:28
@patrick-schultz patrick-schultz force-pushed the ps-12-17-move_mill_modules_into_subdirectory branch from 2b3a4af to a459164 Compare December 18, 2024 18:32
Copy link
Collaborator Author

@patrick-schultz patrick-schultz left a comment

Choose a reason for hiding this comment

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

As long as we're already moving everything, should I also switch to the mill default directory structure, moving modules/src/main/java and modules/src/main/scala to modules/src, moving modules/src/main/resources to modules/resources, and moving modules/src/test to modules/test?

@chrisvittal
Copy link
Collaborator

If that's the mill default project structure, then yes.

@patrick-schultz patrick-schultz force-pushed the ps-12-17-move_mill_modules_into_subdirectory branch from a459164 to a40fa7d Compare December 18, 2024 19:19
@patrick-schultz patrick-schultz force-pushed the ps-12-17-move_mill_modules_into_subdirectory branch 4 times, most recently from 47f75a5 to e7d3284 Compare January 2, 2025 20:17
@patrick-schultz patrick-schultz force-pushed the ps-12-17-move_mill_modules_into_subdirectory branch 2 times, most recently from c54210d to e2bdc83 Compare January 9, 2025 19:59
@patrick-schultz patrick-schultz changed the base branch from main to ps/fix-ignore January 9, 2025 19:59
@patrick-schultz patrick-schultz changed the title move mill modules into subdirectory [query] move mill modules into subdirectory Jan 9, 2025
@patrick-schultz patrick-schultz force-pushed the ps-12-17-move_mill_modules_into_subdirectory branch 2 times, most recently from c2603da to 005d23f Compare January 10, 2025 19:38
@patrick-schultz patrick-schultz force-pushed the ps-12-17-move_mill_modules_into_subdirectory branch from 005d23f to 52033ec Compare January 14, 2025 22:11
@patrick-schultz patrick-schultz force-pushed the ps-12-17-move_mill_modules_into_subdirectory branch from 52033ec to 2d1ab3b Compare January 17, 2025 19:46
Base automatically changed from ps/fix-ignore to main January 17, 2025 21:41
@patrick-schultz patrick-schultz force-pushed the ps-12-17-move_mill_modules_into_subdirectory branch 3 times, most recently from b64f011 to b4c7447 Compare January 21, 2025 16:23
@patrick-schultz patrick-schultz force-pushed the ps-12-17-move_mill_modules_into_subdirectory branch 4 times, most recently from 468844b to fcb6c23 Compare January 22, 2025 19:50
@patrick-schultz patrick-schultz force-pushed the ps-12-17-move_mill_modules_into_subdirectory branch from fcb6c23 to b9fe4aa Compare January 24, 2025 19:24
@hail-ci-robot hail-ci-robot merged commit 79c599a into main Jan 24, 2025
4 checks passed
@hail-ci-robot hail-ci-robot deleted the ps-12-17-move_mill_modules_into_subdirectory branch January 24, 2025 20:33
@ehigham ehigham added the full-deploy Requires a full deployment at this commit before following commits can be deployed label Jan 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
full-deploy Requires a full deployment at this commit before following commits can be deployed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants