Skip to content

Commit

Permalink
ci-builder: fix build (ethereum-optimism#10158)
Browse files Browse the repository at this point in the history
Copies over `yq` and `just` into the final docker image. Older
versions of `ci-builder` are known to contain `just`, something
must have changed to have them no longer fully include it.
We need to tie the release of `ci-builder` with a bump of
the foundry version unless the foundry version we are using
is still available via nightly binary download. This is because
every time we build foundry in CI it produces a bad build
that results in an "illegal instruction" error.
  • Loading branch information
tynes authored Apr 15, 2024
1 parent 1d2054e commit 2d354ac
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions ops/docker/ci-builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,14 @@ COPY --from=go-build /go/bin/mockery /go/bin/mockery
COPY --from=go-build /go/bin/golangci-lint /go/bin/golangci-lint
COPY --from=go-build /go/bin/abigen /usr/local/bin/abigen
COPY --from=go-build /go/bin/geth /usr/local/bin/geth
COPY --from=go-build /go/bin/yq /go/bin/yq

# copy tools
COPY --from=rust-build /root/.foundry/bin/forge /usr/local/bin/forge
COPY --from=rust-build /root/.foundry/bin/cast /usr/local/bin/cast
COPY --from=rust-build /root/.foundry/bin/anvil /usr/local/bin/anvil
COPY --from=rust-build /root/.cargo/bin/svm /usr/local/bin/svm
COPY --from=rust-build /root/.cargo/bin/just /usr/local/bin/just

COPY .nvmrc .nvmrc
COPY ./versions.json ./versions.json
Expand Down

0 comments on commit 2d354ac

Please sign in to comment.