Skip to content

chore: replace stale make calls with just #19596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevennevins merged 2 commits into from
Mar 17, 2026
Merged

chore: replace stale make calls with just #19596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57a78e6
chore: replace stale make calls with just, falling back for old tags
ajsutton Mar 17, 2026
e485c54
fix: check for specific just recipe, not just justfile existence
ajsutton Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions cannon/scripts/build-legacy-cannons.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ] && (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
fi
cp "${BIN_DIR}/cannon-"* "${EMBEDS_DIR}/"
echo "Built ${TAG} with versions:"
(cd "${BIN_DIR}" && ls cannon-*)
Expand All @@ -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 ] && just --show cannon &>/dev/null; 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
2 changes: 1 addition & 1 deletion op-alt-da/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion op-dispute-mon/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 5 additions & 1 deletion op-program/scripts/build-prestates.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] && just --show reproducible-prestate &>/dev/null; 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
Expand Down