diff --git a/cartesi-rollups/contracts/justfile b/cartesi-rollups/contracts/justfile index 66300832..3f1e17ef 100644 --- a/cartesi-rollups/contracts/justfile +++ b/cartesi-rollups/contracts/justfile @@ -16,8 +16,8 @@ fmt: check-fmt: forge fmt --check -install-deps: - pnpm install +install-deps PNPM_INSTALL_ARGS='' PNPM_CI='true': + CI={{PNPM_CI}} pnpm install {{PNPM_INSTALL_ARGS}} forge soldeer install # compile smart contracts diff --git a/prt/contracts/justfile b/prt/contracts/justfile index adfdacbb..0a7171e0 100644 --- a/prt/contracts/justfile +++ b/prt/contracts/justfile @@ -31,8 +31,8 @@ fmt: check-fmt: forge fmt --check -install-deps: - pnpm install +install-deps PNPM_INSTALL_ARGS='' PNPM_CI='true': + CI={{PNPM_CI}} pnpm install {{PNPM_INSTALL_ARGS}} forge soldeer install clean-bindings: diff --git a/test/Dockerfile b/test/Dockerfile index ecaac8f8..f05bc931 100644 --- a/test/Dockerfile +++ b/test/Dockerfile @@ -1,67 +1,137 @@ -# syntax=docker.io/docker/dockerfile-upstream:1.12.1-labs +# syntax=docker.io/docker/dockerfile:1 -#### prepare tools -FROM rust:1.85 AS tools -# foundry +ARG RUST_VERSION=1.86 +ARG FOUNDRY_VERSION=1.4.3 +ARG PNPM_VERSION=10.7.0 +ARG JUST_VERSION=1.46.0 + +#### base stage +FROM rust:${RUST_VERSION} AS base ARG DEBIAN_FRONTEND=noninteractive +SHELL ["/usr/bin/env", "bash", "-euo", "pipefail", "-c"] RUN <