chore(op-e2e): migrate Makefile to justfile#19475
Merged
Conversation
0ed0b17 to
2ab92b3
Compare
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## develop #19475 +/- ##
===========================================
+ Coverage 75.3% 75.9% +0.5%
===========================================
Files 194 477 +283
Lines 11285 59985 +48700
===========================================
+ Hits 8502 45531 +37029
- Misses 2639 14454 +11815
+ Partials 144 0 -144
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
8f8803c to
707214d
Compare
8ad9445 to
c590c38
Compare
ee44bd6 to
38cf3bd
Compare
Migrate cannon build targets from Make to Just. The Makefile now delegates to just with a deprecation warning, preserving backwards compatibility for existing make invocations. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…context - Add `lint` to DEPRECATED_TARGETS and justfile (CI compatibility stub) - Copy justfiles/ into kona cannon-repro.dockerfile for deprecated.mk shim - Install `just` binary in cannon Docker build for the Make shim Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
The Alpine 3.21 just package is v1.37.0 which doesn't support the [default] attribute. Move cannon recipe to first position instead. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
The cannon Makefile deprecated shim requires justfiles/deprecated.mk, which is resolved relative to cannon/ inside the Docker container. The op-program Dockerfile.repro.dockerignore was excluding justfiles/ from the build context, causing the cannon make shim to fail. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Instead of going through the deprecated Make shim, invoke just cannon directly in the Docker build. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
The diff-%-cannon Make pattern target was converted to a parameterized just recipe (just diff-cannon VM). Update the Dockerfile to call just directly instead of through make, which would fail since the deprecated shim doesn't support pattern targets. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Preserves backwards compatibility for make diff-<vm>-cannon invocations (used by Dockerfile.diff and potentially other scripts) by translating the pattern to just diff-cannon <vm>. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
- cannon/Dockerfile.diff: use `apk add just` instead of curl install script, drop unnecessary `make` dependency - cannon-repro.dockerfile: switch cannon-build stage from ubuntu:22.04 to golang:1.23.8-alpine3.21, matching the monorepo's Go builder image, so just can be installed via `apk add` instead of curl install script Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1700a5c to
8aa5350
Compare
50c0f17 to
b9a8200
Compare
The golang Docker image sets GOTOOLCHAIN=local which prevents automatic toolchain downloading. Since go.mod requires go 1.24.0, the 1.23.8 image fails to build. Match Dockerfile.diff which already uses 1.24.10. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Migrate op-e2e build targets from Make to Just. The Makefile now delegates to just with a deprecation warning, preserving backwards compatibility for existing make invocations. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
b9a8200 to
8a674d6
Compare
…d shim The deprecated.mk shim was changed to pass JUSTFLAGS as just CLI variable overrides (`just VAR=val target`), but just rejects overrides for variables not declared in the justfile. This broke CI jobs where Make variable assignments propagate through sub-makes (e.g. GO_TEST_FLAGS, GUEST_PROGRAM). Revert to passing them as environment variables via `env`, which is how the shim originally worked in the cannon migration PR. Fixes: go-tests-short, sanitize-op-program CI failures Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
sebastianst
approved these changes
Mar 12, 2026
Member
sebastianst
left a comment
There was a problem hiding this comment.
lgtm. one minor issue with the gen-binding change to a positional param, it means that the shim doesn't work, so we may just want to remove it from the Makefile.
Claude: gen-binding breaks through the deprecated Make shim
The original: make gen-binding CONTRACT=OPContractsManager
The shim translates this to: env CONTRACT=OPContractsManager just gen-binding
But the justfile declares gen-binding CONTRACT: — a positional parameter, not an env var. This will fail with "missing argument" because just
doesn't populate positional params from env vars.
Either the justfile should use env('CONTRACT', '') with a guard, or gen-binding needs to be excluded from the deprecated shim and given its
own pattern that forwards the variable as a positional arg.
Contributor
Author
|
Dang it, my Claude didn't find that. 😆 I think that may be why Claude is going back and forth with a change to the deprecation tooling for just changing whether it converts args to ENV vars or positional ones. gen-binding would probably be fine not working via the Makefile. For other cases we could just write the Makefile shim manually to convert it exactly how we need it to be. I'll get Claude to review for that problem across all the PRs. |
The generic deprecated.mk shim converts make variables to env vars, but gen-binding CONTRACT: is a positional parameter in just. Write a manual shim that passes CONTRACT correctly as a positional arg. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
justwith a deprecation warningtest,test-ws,test-actions,test-http,test-cannon,test-fault-proofs,fuzz,clean,gen-binding,cannon-prestates,test-externalKey changes
JUNIT_FILEconditional logic uses just'senv()andifexpressionstest-external-%Make pattern becomestest-external NAMEwith a parameterpre-test-cannondirectory check uses a shebang scriptgen-bindingrequiresCONTRACTas a just parameter instead of Make variablenum_coresuses just's built-innum_cpus()Stack
Test plan
just --listshows all expected targetsjust --dry-run test-wsproduces correct commandJUNIT_FILE=/tmp/t.xml JSON_LOG_FILE=/tmp/t.json just --dry-run test-wsproduces gotestsum command with correct flags🤖 Generated with Claude Code