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

Commit 643d4f1

Browse files
ajsuttonclaude
ajsutton
and
claude
authored
chore: replace stale make calls with just (#19596)
* 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) <noreply@anthropic.com> * 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 <recipe>` before attempting to use it, falling back to make when the recipe is missing. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 1214693 commit 643d4f1

4 files changed

Lines changed: 17 additions & 5 deletions

File tree

‎cannon/scripts/build-legacy-cannons.sh‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ function buildVersion() {
3434
git checkout "${TAG}" > "${LOG_FILE}" 2>&1
3535
git submodule update --init --recursive >> "${LOG_FILE}" 2>&1
3636
rm -rf "${BIN_DIR}/cannon-"*
37-
make -C "${REPO_DIR}/cannon" cannon-embeds >> "${LOG_FILE}" 2>&1
37+
if [ -f "${REPO_DIR}/cannon/justfile" ] && (cd "${REPO_DIR}/cannon" && just --show cannon-embeds &>/dev/null); then
38+
(cd "${REPO_DIR}/cannon" && just cannon-embeds >> "${LOG_FILE}" 2>&1)
39+
else
40+
make -C "${REPO_DIR}/cannon" cannon-embeds >> "${LOG_FILE}" 2>&1
41+
fi
3842
cp "${BIN_DIR}/cannon-"* "${EMBEDS_DIR}/"
3943
echo "Built ${TAG} with versions:"
4044
(cd "${BIN_DIR}" && ls cannon-*)
@@ -52,7 +56,11 @@ done
5256
cd "${CANNON_DIR}"
5357
LOG_FILE="${LOGS_DIR}/build-current.txt"
5458
echo "Building current version of cannon Logs: ${LOG_FILE}"
55-
make cannon > "${LOG_FILE}" 2>&1
59+
if [ -f justfile ] && just --show cannon &>/dev/null; then
60+
just cannon > "${LOG_FILE}" 2>&1
61+
else
62+
make cannon > "${LOG_FILE}" 2>&1
63+
fi
5664

5765
echo "All cannon versions successfully built and available in ${EMBEDS_DIR}"
5866
"${CANNON_DIR}/bin/cannon" list

‎op-alt-da/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:latest
22
FROM $OP_STACK_GO_BUILDER AS builder
3-
# See "make golang-docker" and /ops/docker/op-stack-go
3+
# See "just golang-docker" and /ops/docker/op-stack-go
44

55
FROM alpine:3.20
66

‎op-dispute-mon/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack-go:latest
22
FROM $OP_STACK_GO_BUILDER AS builder
3-
# See "make golang-docker" and /ops/docker/op-stack-go
3+
# See "just golang-docker" and /ops/docker/op-stack-go
44

55
FROM alpine:3.20
66

‎op-program/scripts/build-prestates.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,11 @@ EOF
106106

107107
rm -rf "${BIN_DIR}"
108108
rm -rf rust/kona/prestate-artifacts-*
109-
make reproducible-prestate >> "${log_file}" 2>&1
109+
if [ -f justfile ] && just --show reproducible-prestate &>/dev/null; then
110+
just reproducible-prestate >> "${log_file}" 2>&1
111+
else
112+
make reproducible-prestate >> "${log_file}" 2>&1
113+
fi
110114

111115
if [[ "${version}" =~ ^op-program/v ]]; then
112116
if [ -f "${BIN_DIR}/prestate-proof.json" ]; then

0 commit comments

Comments
 (0)