Commit 2d354ac4 authored by Mark Tyneway's avatar Mark Tyneway Committed by GitHub

ci-builder: fix build (#10158)

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.
parent 1d2054e8
...@@ -84,12 +84,14 @@ COPY --from=go-build /go/bin/mockery /go/bin/mockery ...@@ -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/golangci-lint /go/bin/golangci-lint
COPY --from=go-build /go/bin/abigen /usr/local/bin/abigen 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/geth /usr/local/bin/geth
COPY --from=go-build /go/bin/yq /go/bin/yq
# copy tools # copy tools
COPY --from=rust-build /root/.foundry/bin/forge /usr/local/bin/forge 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/cast /usr/local/bin/cast
COPY --from=rust-build /root/.foundry/bin/anvil /usr/local/bin/anvil 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/svm /usr/local/bin/svm
COPY --from=rust-build /root/.cargo/bin/just /usr/local/bin/just
COPY .nvmrc .nvmrc COPY .nvmrc .nvmrc
COPY ./versions.json ./versions.json COPY ./versions.json ./versions.json
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment