From 19d90f82766016e3cc5fe1f0db74eb7fc3bd20f6 Mon Sep 17 00:00:00 2001 From: Han Date: Sat, 13 Dec 2025 15:43:13 +0900 Subject: [PATCH] Fix CI script and remove unnecessary `CI` build arg (#248) --- .github/scripts/pull-or-build-base-zkvm-image.sh | 3 +-- .github/workflows/test-zkvm.yml | 1 - docker/zisk/Dockerfile.base | 3 --- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/scripts/pull-or-build-base-zkvm-image.sh b/.github/scripts/pull-or-build-base-zkvm-image.sh index c65950d..3c5e5cb 100644 --- a/.github/scripts/pull-or-build-base-zkvm-image.sh +++ b/.github/scripts/pull-or-build-base-zkvm-image.sh @@ -19,7 +19,7 @@ if docker image pull $CACHED_BASE_IMAGE; then else echo "Building ere-base" docker build \ - --file docker/base/Dockerfile.base \ + --file docker/Dockerfile.base \ --tag $BASE_IMAGE \ . fi @@ -34,6 +34,5 @@ else --file docker/$ZKVM/Dockerfile.base \ --tag $BASE_ZKVM_IMAGE \ --build-arg BASE_IMAGE=$BASE_IMAGE \ - --build-arg CI=1 \ . fi diff --git a/.github/workflows/test-zkvm.yml b/.github/workflows/test-zkvm.yml index 03f0721..80981d2 100644 --- a/.github/workflows/test-zkvm.yml +++ b/.github/workflows/test-zkvm.yml @@ -111,7 +111,6 @@ jobs: tags: ${{ steps.image_meta.outputs.base_zkvm_image }} build-args: | BASE_IMAGE=${{ steps.image_meta.outputs.base_image }} - CI=1 - name: Build ere-compiler-${{ inputs.zkvm }} image if: github.event_name == 'push' && github.ref == 'refs/heads/master' diff --git a/docker/zisk/Dockerfile.base b/docker/zisk/Dockerfile.base index 6ad5bc1..57224b8 100644 --- a/docker/zisk/Dockerfile.base +++ b/docker/zisk/Dockerfile.base @@ -45,9 +45,6 @@ COPY --chmod=755 scripts/sdk_installers/install_zisk_sdk.sh /tmp/install_zisk_sd # Run the ZisK SDK installation script using ziskup. # This script installs the 'zisk' Rust toolchain and `cargo-zisk` -# -# If argument `CI` is set, we only install verifying key, this is used by GitHub -# CI runner which only has small disk space (proving key requires ~27 GB). RUN /tmp/install_zisk_sdk.sh && \ rm /tmp/install_zisk_sdk.sh && \ # Remove the merkle tree of proving key to reduce docker image size (~20 GB).