Fix Pages build output and compose circuits platform defaults

This commit is contained in:
andrussal 2025-12-09 14:01:39 +01:00
parent 88ef948993
commit bc7094fb5b
2 changed files with 19 additions and 7 deletions

View File

@ -130,7 +130,7 @@ jobs:
run: cargo +nightly-2025-09-14 install --git https://github.com/bnjbvr/cargo-machete --locked cargo-machete run: cargo +nightly-2025-09-14 install --git https://github.com/bnjbvr/cargo-machete --locked cargo-machete
- run: cargo machete - run: cargo machete
local_smoke: host_smoke:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
VERSION: v0.3.1 VERSION: v0.3.1
@ -223,7 +223,7 @@ jobs:
NOMOS_LOG_DIR: "${{ runner.temp }}/local-logs" NOMOS_LOG_DIR: "${{ runner.temp }}/local-logs"
run: | run: |
scripts/run-examples.sh -t 60 -v 1 -e 1 host scripts/run-examples.sh -t 60 -v 1 -e 1 host
- name: Collect local demo logs (on failure) - name: Collect host demo logs (on failure)
if: failure() if: failure()
run: | run: |
if [ -d "${NOMOS_LOG_DIR}" ]; then if [ -d "${NOMOS_LOG_DIR}" ]; then
@ -233,21 +233,21 @@ jobs:
else else
echo "No local logs directory at ${NOMOS_LOG_DIR}" echo "No local logs directory at ${NOMOS_LOG_DIR}"
fi fi
- name: Upload local smoke logs - name: Upload host smoke logs
if: failure() if: failure()
id: upload-local-logs id: upload-local-logs
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: local-smoke-logs name: host-smoke-logs
path: ${{ runner.temp }}/local-logs.tgz path: ${{ runner.temp }}/local-logs.tgz
if-no-files-found: error if-no-files-found: error
- name: Print local smoke logs download URL - name: Print host smoke logs download URL
if: failure() if: failure()
env: env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: | run: |
gh api "repos/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}/artifacts" \ gh api "repos/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}/artifacts" \
--jq '.artifacts[] | select(.name=="local-smoke-logs") | "local-smoke-logs: \(.archive_download_url)"' || true --jq '.artifacts[] | select(.name=="host-smoke-logs") | "host-smoke-logs: \(.archive_download_url)"' || true
compose_smoke: compose_smoke:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -434,7 +434,7 @@ jobs:
- name: Markdown lint - name: Markdown lint
run: npx -y markdownlint-cli2 "book/src/**/*.md" run: npx -y markdownlint-cli2 "book/src/**/*.md"
- name: Build book - name: Build book
run: mdbook build book run: mdbook build book -d target/book
- name: Add .nojekyll - name: Add .nojekyll
run: touch target/book/.nojekyll run: touch target/book/.nojekyll
- name: Check links - name: Check links

View File

@ -320,6 +320,17 @@ if [ "$MODE" = "compose" ] || [ "$MODE" = "k8s" ]; then
else else
KZG_PATH="${KZG_HOST_PATH}" KZG_PATH="${KZG_HOST_PATH}"
fi fi
# Ensure compose image pulls circuits for the host architecture by default.
if [ "$MODE" = "compose" ] && [ -z "${COMPOSE_CIRCUITS_PLATFORM:-}" ]; then
arch="$(uname -m)"
case "$arch" in
x86_64) COMPOSE_CIRCUITS_PLATFORM="linux-x86_64" ;;
arm64|aarch64) COMPOSE_CIRCUITS_PLATFORM="linux-aarch64" ;;
*) COMPOSE_CIRCUITS_PLATFORM="linux-x86_64" ;;
esac
fi
if [ -n "${DEMO_VALIDATORS}" ]; then if [ -n "${DEMO_VALIDATORS}" ]; then
export NOMOS_DEMO_VALIDATORS="${DEMO_VALIDATORS}" export NOMOS_DEMO_VALIDATORS="${DEMO_VALIDATORS}"
fi fi
@ -335,4 +346,5 @@ LOCAL_DEMO_RUN_SECS="${RUN_SECS}" \
K8S_DEMO_RUN_SECS="${RUN_SECS}" \ K8S_DEMO_RUN_SECS="${RUN_SECS}" \
NOMOS_NODE_BIN="${NOMOS_NODE_BIN:-}" \ NOMOS_NODE_BIN="${NOMOS_NODE_BIN:-}" \
NOMOS_EXECUTOR_BIN="${NOMOS_EXECUTOR_BIN:-}" \ NOMOS_EXECUTOR_BIN="${NOMOS_EXECUTOR_BIN:-}" \
COMPOSE_CIRCUITS_PLATFORM="${COMPOSE_CIRCUITS_PLATFORM:-}" \
cargo run -p runner-examples --bin "${BIN}" cargo run -p runner-examples --bin "${BIN}"