From 57a78e65bd22c3e76e4a23ecc5617f3f927186dd Mon Sep 17 00:00:00 2001 From: Adrian Sutton Date: Tue, 17 Mar 2026 09:48:42 +0000 Subject: [PATCH 1/2] chore: replace stale make calls with just, falling back for old tags build-prestates.sh and build-legacy-cannons.sh build from historic tags where justfiles may not exist yet, so prefer just when a justfile is present and fall back to make otherwise. Also updates stale "make golang-docker" comments in Dockerfiles. Part of #19546. Co-Authored-By: Claude Opus 4.6 (1M context) --- cannon/scripts/build-legacy-cannons.sh | 12 ++++++++++-- op-alt-da/Dockerfile | 2 +- op-dispute-mon/Dockerfile | 2 +- op-program/scripts/build-prestates.sh | 6 +++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/cannon/scripts/build-legacy-cannons.sh b/cannon/scripts/build-legacy-cannons.sh index e6e3be05557a9..ae78fabca26f9 100755 --- a/cannon/scripts/build-legacy-cannons.sh +++ b/cannon/scripts/build-legacy-cannons.sh @@ -34,7 +34,11 @@ function buildVersion() { git checkout "${TAG}" > "${LOG_FILE}" 2>&1 git submodule update --init --recursive >> "${LOG_FILE}" 2>&1 rm -rf "${BIN_DIR}/cannon-"* - make -C "${REPO_DIR}/cannon" cannon-embeds >> "${LOG_FILE}" 2>&1 + if [ -f "${REPO_DIR}/cannon/justfile" ]; then + (cd "${REPO_DIR}/cannon" && just cannon-embeds >> "${LOG_FILE}" 2>&1) + else + make -C "${REPO_DIR}/cannon" cannon-embeds >> "${LOG_FILE}" 2>&1 + fi cp "${BIN_DIR}/cannon-"* "${EMBEDS_DIR}/" echo "Built ${TAG} with versions:" (cd "${BIN_DIR}" && ls cannon-*) @@ -52,7 +56,11 @@ done cd "${CANNON_DIR}" LOG_FILE="${LOGS_DIR}/build-current.txt" echo "Building current version of cannon Logs: ${LOG_FILE}" -make cannon > "${LOG_FILE}" 2>&1 +if [ -f justfile ]; then + just cannon > "${LOG_FILE}" 2>&1 +else + make cannon > "${LOG_FILE}" 2>&1 +fi echo "All cannon versions successfully built and available in ${EMBEDS_DIR}" "${CANNON_DIR}/bin/cannon" list diff --git a/op-alt-da/Dockerfile b/op-alt-da/Dockerfile index 44fb2e7fcefd8..b50d10eae061c 100644 --- a/op-alt-da/Dockerfile +++ b/op-alt-da/Dockerfile @@ -1,6 +1,6 @@ ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:latest FROM $OP_STACK_GO_BUILDER AS builder -# See "make golang-docker" and /ops/docker/op-stack-go +# See "just golang-docker" and /ops/docker/op-stack-go FROM alpine:3.20 diff --git a/op-dispute-mon/Dockerfile b/op-dispute-mon/Dockerfile index 9f215eb073db6..abd7e4f245c34 100644 --- a/op-dispute-mon/Dockerfile +++ b/op-dispute-mon/Dockerfile @@ -1,6 +1,6 @@ ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:latest FROM $OP_STACK_GO_BUILDER AS builder -# See "make golang-docker" and /ops/docker/op-stack-go +# See "just golang-docker" and /ops/docker/op-stack-go FROM alpine:3.20 diff --git a/op-program/scripts/build-prestates.sh b/op-program/scripts/build-prestates.sh index 8507237433277..8458939b0814c 100755 --- a/op-program/scripts/build-prestates.sh +++ b/op-program/scripts/build-prestates.sh @@ -106,7 +106,11 @@ EOF rm -rf "${BIN_DIR}" rm -rf rust/kona/prestate-artifacts-* - make reproducible-prestate >> "${log_file}" 2>&1 + if [ -f justfile ]; then + just reproducible-prestate >> "${log_file}" 2>&1 + else + make reproducible-prestate >> "${log_file}" 2>&1 + fi if [[ "${version}" =~ ^op-program/v ]]; then if [ -f "${BIN_DIR}/prestate-proof.json" ]; then From e485c54bde4cbf566bddc02888efc32c9ce41980 Mon Sep 17 00:00:00 2001 From: Adrian Sutton Date: Tue, 17 Mar 2026 10:11:53 +0000 Subject: [PATCH 2/2] fix: check for specific just recipe, not just justfile existence Tags like kona-client/v1.2.10-rc.1 have a justfile but predate the reproducible-prestate recipe. Check that the recipe exists with `just --show ` before attempting to use it, falling back to make when the recipe is missing. Co-Authored-By: Claude Opus 4.6 (1M context) --- cannon/scripts/build-legacy-cannons.sh | 4 ++-- op-program/scripts/build-prestates.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cannon/scripts/build-legacy-cannons.sh b/cannon/scripts/build-legacy-cannons.sh index ae78fabca26f9..2ed0fd48ba855 100755 --- a/cannon/scripts/build-legacy-cannons.sh +++ b/cannon/scripts/build-legacy-cannons.sh @@ -34,7 +34,7 @@ function buildVersion() { git checkout "${TAG}" > "${LOG_FILE}" 2>&1 git submodule update --init --recursive >> "${LOG_FILE}" 2>&1 rm -rf "${BIN_DIR}/cannon-"* - if [ -f "${REPO_DIR}/cannon/justfile" ]; then + if [ -f "${REPO_DIR}/cannon/justfile" ] && (cd "${REPO_DIR}/cannon" && just --show cannon-embeds &>/dev/null); then (cd "${REPO_DIR}/cannon" && just cannon-embeds >> "${LOG_FILE}" 2>&1) else make -C "${REPO_DIR}/cannon" cannon-embeds >> "${LOG_FILE}" 2>&1 @@ -56,7 +56,7 @@ done cd "${CANNON_DIR}" LOG_FILE="${LOGS_DIR}/build-current.txt" echo "Building current version of cannon Logs: ${LOG_FILE}" -if [ -f justfile ]; then +if [ -f justfile ] && just --show cannon &>/dev/null; then just cannon > "${LOG_FILE}" 2>&1 else make cannon > "${LOG_FILE}" 2>&1 diff --git a/op-program/scripts/build-prestates.sh b/op-program/scripts/build-prestates.sh index 8458939b0814c..cbe8de998364b 100755 --- a/op-program/scripts/build-prestates.sh +++ b/op-program/scripts/build-prestates.sh @@ -106,7 +106,7 @@ EOF rm -rf "${BIN_DIR}" rm -rf rust/kona/prestate-artifacts-* - if [ -f justfile ]; then + if [ -f justfile ] && just --show reproducible-prestate &>/dev/null; then just reproducible-prestate >> "${log_file}" 2>&1 else make reproducible-prestate >> "${log_file}" 2>&1