Sitelet https://github.com/ethereum-optimism/optimism/commit/fdf9103cab4cbcc89270f962a42ca58e983dc321
Skip to content

Commit fdf9103

Browse files
ajsuttonclaude
ajsutton
and
claude
authored
chore: replace stale make calls with just in CI, Dockerfile, and Go errors (#19526)
* chore: replace stale make calls with just in Dockerfile and Go error messages The Dockerfile build stages and op-program builder error messages still referenced make targets that go through a deprecation shim. Replace them with direct just calls since just is already installed in the builder image. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * chore(ci): replace make fuzz with just fuzz in CircleCI Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix(docker): pass build vars as env vars, not just args just doesn't support KEY=VALUE after recipe names like make does. Move GOOS, GOARCH, GITCOMMIT, GITDATE, and VERSION to environment variable position (before the command) so justfiles can read them via env(). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 13c74c6 commit fdf9103

3 files changed

Lines changed: 39 additions & 39 deletions

File tree

‎.circleci/continue/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1777,7 +1777,7 @@ jobs:
17771777
name: Fuzz
17781778
no_output_timeout: 15m
17791779
command: |
1780-
make fuzz
1780+
just fuzz
17811781
working_directory: "<<parameters.package_name>>"
17821782
- go-save-cache:
17831783
namespace: fuzz-<<parameters.package_name>>

‎op-program/builder/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ func buildPrestate(ctx context.Context, log log.Logger, programELF string, versi
5252

5353
cannonBin := filepath.Join(root, "cannon", "bin", "cannon")
5454
if _, err := os.Stat(cannonBin); err != nil {
55-
return fmt.Errorf("cannon binary not found: %w. make sure it's built with `make cannon`", err)
55+
return fmt.Errorf("cannon binary not found: %w. make sure it's built with `just cannon`", err)
5656
}
5757
prestate := filepath.Join(root, "op-program", "bin", "prestate"+suffix+".bin.gz")
5858
if _, err := os.Stat(programELF); err != nil {
59-
return fmt.Errorf("op-program elf not found: %w. make sure it's built with `make op-program`", err)
59+
return fmt.Errorf("op-program elf not found: %w. make sure it's built with `just op-program`", err)
6060
}
6161
meta := filepath.Join(root, "op-program", "bin", "meta"+suffix+".json")
6262

‎ops/docker/op-stack-go/Dockerfile‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -108,97 +108,97 @@ COPY --from=cannon-builder-v1-4-0 /usr/local/bin/cannon-5 ./cannon/multicannon/e
108108
COPY --from=cannon-builder-v1-4-0 /usr/local/bin/cannon-6 ./cannon/multicannon/embeds/cannon-6
109109
COPY --from=cannon-builder-v1-6-0 /usr/local/bin/cannon-7 ./cannon/multicannon/embeds/cannon-7
110110
# Build current binaries
111-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd cannon && make cannon \
112-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$CANNON_VERSION"
111+
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
112+
cd cannon && GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$CANNON_VERSION" just cannon
113113

114114
FROM --platform=$BUILDPLATFORM builder AS op-program-builder
115115
ARG OP_PROGRAM_VERSION=v0.0.0
116116
# note: we only build the host, that's all the user needs. No Go MIPS cross-build in docker
117-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd op-program && make op-program-host \
118-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_PROGRAM_VERSION"
117+
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
118+
cd op-program && GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_PROGRAM_VERSION" just op-program-host
119119

120120
FROM --platform=$BUILDPLATFORM builder AS op-wheel-builder
121121
ARG OP_WHEEL_VERSION=v0.0.0
122-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd op-wheel && make op-wheel \
123-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_WHEEL_VERSION"
122+
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
123+
cd op-wheel && GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_WHEEL_VERSION" just op-wheel
124124

125125
FROM --platform=$BUILDPLATFORM builder AS op-node-builder
126126
ARG OP_NODE_VERSION=v0.0.0
127-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd op-node && make op-node \
128-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_NODE_VERSION"
127+
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
128+
cd op-node && GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_NODE_VERSION" just op-node
129129

130130
FROM --platform=$BUILDPLATFORM builder AS op-challenger-builder
131131
ARG OP_CHALLENGER_VERSION=v0.0.0
132-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd op-challenger && make op-challenger \
133-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_CHALLENGER_VERSION"
132+
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
133+
cd op-challenger && GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_CHALLENGER_VERSION" just op-challenger
134134

135135
FROM --platform=$BUILDPLATFORM builder AS op-dispute-mon-builder
136136
ARG OP_DISPUTE_MON_VERSION=v0.0.0
137-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd op-dispute-mon && make op-dispute-mon \
138-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_DISPUTE_MON_VERSION"
137+
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
138+
cd op-dispute-mon && GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_DISPUTE_MON_VERSION" just op-dispute-mon
139139

140140
FROM --platform=$BUILDPLATFORM builder AS op-batcher-builder
141141
ARG OP_BATCHER_VERSION=v0.0.0
142-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd op-batcher && make op-batcher \
143-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_BATCHER_VERSION"
142+
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
143+
cd op-batcher && GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_BATCHER_VERSION" just op-batcher
144144

145145
FROM --platform=$BUILDPLATFORM builder AS op-proposer-builder
146146
ARG OP_PROPOSER_VERSION=v0.0.0
147-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd op-proposer && make op-proposer \
148-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_PROPOSER_VERSION"
147+
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
148+
cd op-proposer && GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_PROPOSER_VERSION" just op-proposer
149149

150150
FROM --platform=$BUILDPLATFORM builder AS op-conductor-builder
151151
ARG OP_CONDUCTOR_VERSION=v0.0.0
152-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd op-conductor && make op-conductor \
153-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_CONDUCTOR_VERSION"
152+
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
153+
cd op-conductor && GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_CONDUCTOR_VERSION" just op-conductor
154154

155155
FROM --platform=$BUILDPLATFORM builder AS da-server-builder
156-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd op-alt-da && make da-server \
157-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE
156+
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
157+
cd op-alt-da && GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE just da-server
158158

159159
FROM --platform=$BUILDPLATFORM builder AS op-supervisor-builder
160160
ARG OP_SUPERVISOR_VERSION=v0.0.0
161-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd op-supervisor && make op-supervisor \
162-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_SUPERVISOR_VERSION"
161+
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
162+
cd op-supervisor && GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_SUPERVISOR_VERSION" just op-supervisor
163163

164164
FROM --platform=$BUILDPLATFORM builder AS op-supernode-builder
165165
ARG OP_SUPERNODE_VERSION=v0.0.0
166-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd op-supernode && make op-supernode \
167-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_SUPERNODE_VERSION"
166+
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
167+
cd op-supernode && GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_SUPERNODE_VERSION" just op-supernode
168168

169169
FROM --platform=$BUILDPLATFORM builder AS op-interop-filter-builder
170170
ARG OP_INTEROP_FILTER_VERSION=v0.0.0
171-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd op-interop-filter && make op-interop-filter \
172-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_INTEROP_FILTER_VERSION"
171+
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
172+
cd op-interop-filter && GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_INTEROP_FILTER_VERSION" just op-interop-filter
173173

174174
FROM --platform=$BUILDPLATFORM builder AS op-test-sequencer-builder
175175
ARG OP_TEST_SEQUENCER_VERSION=v0.0.0
176-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd op-test-sequencer && make op-test-sequencer \
177-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_TEST_SEQUENCER_VERSION"
176+
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
177+
cd op-test-sequencer && GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_TEST_SEQUENCER_VERSION" just op-test-sequencer
178178

179179
FROM --platform=$BUILDPLATFORM builder AS op-deployer-builder
180180
ARG OP_DEPLOYER_VERSION=v0.0.0
181181
COPY --from=builder_foundry /usr/local/bin/forge /usr/local/bin/forge
182-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build just \
182+
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
183183
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_DEPLOYER_VERSION" \
184-
op-deployer/build-go
184+
just op-deployer/build-go
185185

186186
FROM --platform=$BUILDPLATFORM builder AS op-dripper-builder
187187
ARG OP_DRIPPER_VERSION=v0.0.0
188-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build cd op-dripper && make op-dripper \
189-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_DRIPPER_VERSION"
188+
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
189+
cd op-dripper && GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_DRIPPER_VERSION" just op-dripper
190190

191191
FROM --platform=$BUILDPLATFORM builder AS op-faucet-builder
192192
ARG OP_FAUCET_VERSION=v0.0.0
193-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build just \
193+
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
194194
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_FAUCET_VERSION" \
195-
op-faucet/op-faucet
195+
just op-faucet/op-faucet
196196

197197
FROM --platform=$BUILDPLATFORM builder AS op-interop-mon-builder
198198
ARG OP_INTEROP_MON_VERSION=v0.0.0
199-
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build just \
199+
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
200200
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE VERSION="$OP_INTEROP_MON_VERSION" \
201-
op-interop-mon/op-interop-mon
201+
just op-interop-mon/op-interop-mon
202202

203203
# The Rust version must match rust/rust-toolchain.toml. We don't use "latest" to ensure reproducibility
204204
FROM --platform=$BUILDPLATFORM rust:1.92 AS kona-host-builder

0 commit comments

Comments
 (0)