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.

Sign up for GitHub

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

Jump to bottom

make -> just migration recipe #12883

Merged
merged 4 commits into from
Nov 21, 2024
Merged

make -> just migration recipe #12883

merged 4 commits into from
Nov 21, 2024
+148 −52

Conversation

sigma
Copy link
Contributor

@sigma sigma commented Nov 8, 2024 •
edited
Loading

Description

This change proposes a migration path from current Makefile to future
justfile.

It introduces common modules for just recipes, an include file for
newly-converted Makefiles, and an example of usage for op-batcher.

This enables a smooth transition, keeping "make" working (but
advertising the new workflow) as long as we need it to while
introducing just wherever convenient.

Metadata

@sigma sigma force-pushed the sigma/just-migration branch 5 times, most recently from dc23e03 to bb1f7fd Compare November 8, 2024 16:50
@sigma
Copy link
Contributor Author

sigma commented Nov 8, 2024

Note: this is mostly a POC / RFC at this point. If there's buy-in, we can start migrating targets more seriously.

@sigma sigma marked this pull request as ready for review November 8, 2024 17:01
@sigma sigma requested a review from mslipper November 8, 2024 17:01
sigma
sigma commented Nov 8, 2024
View reviewed changes
@sigma sigma force-pushed the sigma/just-migration branch 2 times, most recently from e3d45b9 to 4e71f61 Compare November 8, 2024 21:24
@sigma sigma requested review from a team as code owners November 8, 2024 21:24
@sigma sigma requested a review from bitwiseguy November 8, 2024 21:24
@sigma sigma marked this pull request as draft November 8, 2024 21:26
@sigma sigma force-pushed the sigma/just-migration branch 5 times, most recently from d9058c4 to 9d11933 Compare November 8, 2024 22:07
@sigma sigma marked this pull request as ready for review November 8, 2024 22:15
@sigma sigma force-pushed the sigma/just-migration branch 5 times, most recently from 3df1cf6 to 81b2ace Compare November 13, 2024 18:06
@tynes
Copy link
Contributor

tynes commented Nov 18, 2024

This is sick!

mslipper
mslipper approved these changes Nov 18, 2024
View reviewed changes
Copy link
Collaborator

@mslipper mslipper left a comment

Choose a reason for hiding this comment

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

LGTM. Really glad we're deprecating Make. What's the plan to communicate this, roll it out, and completely deprecate Make?

protolambda
protolambda approved these changes Nov 19, 2024
View reviewed changes
Copy link
Contributor

@protolambda protolambda left a comment

Choose a reason for hiding this comment

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

Nice work on the just utils 👍

If we create draft PRs for docs updates, then I think we can migrate a service and merge the docs PR around the same time. The just/deprecated.mk is already very helpful.

@sigma
Copy link
Contributor Author

sigma commented Nov 21, 2024 •
edited
Loading

I've thought of some issue: command-line variables for the make invocation are not passed properly to just right now, which is problematic and might disrupt some workflows. Let me take a stab at sanitizing MAKEFLAGS and injecting the result into the just invocation

@sigma sigma force-pushed the sigma/just-migration branch from 81b2ace to 7ec79ca Compare November 21, 2024 16:24
sigma added 4 commits November 21, 2024 17:49
@sigma
build: add just modules
dcfa284 
A lot of our build recipes share similar structures. Move some of
these to modules so we can control them centrally.
@sigma
build: add Makefile deprecation helper
b271172 
This allows us to implement deprecated Makefiles as:

  DEPRECATED_TARGETS := ...
  include ../just/deprecate.mk
@sigma
build(docker): add just modules to docker context
bcd985a 
We need to make sure our build framework is included in the docker build
context.
Also make sure just is part of the builder image.
@sigma
build(op-batcher): migrate build to just
470c28d
@sigma sigma force-pushed the sigma/just-migration branch from 7ec79ca to 470c28d Compare November 21, 2024 16:49
@sigma
Copy link
Contributor Author

sigma commented Nov 21, 2024

I've thought of some issue: command-line variables for the make invocation are not passed properly to just right now, which is problematic and might disrupt some workflows. Let me take a stab at sanitizing MAKEFLAGS and injecting the result into the just invocation

Alright, this is now fixed (and was indeed causing divergence of behavior in CircleCI)
side-note: I hate the makefile language 😛

@mslipper mslipper added this pull request to the merge queue Nov 21, 2024
Merged via the queue into develop with commit c29b209 Nov 21, 2024
45 checks passed
@mslipper mslipper deleted the sigma/just-migration branch November 21, 2024 18:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mslipper mslipper mslipper approved these changes

@protolambda protolambda protolambda approved these changes

@bitwiseguy bitwiseguy Awaiting requested review from bitwiseguy bitwiseguy is a code owner automatically assigned from ethereum-optimism/op-stack

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sigma @tynes @mslipper @protolambda