ci: skip pushing ere-base; build and push ere-cluster

2026-02-19 11:54:42 -05:00 · 2026-02-10 16:19:23 +00:00
parent e2ea5502e3
commit 39cd4e2548
4 changed files with 188 additions and 110 deletions
--- a/.github/scripts/pull-or-build-base-zkvm-image.sh
+++ b/.github/scripts/pull-or-build-base-zkvm-image.sh
@@ -80,18 +80,13 @@ fi

 # Format image

-BASE_IMAGE="${IMAGE_PREFIX}ere-base:${IMAGE_TAG}"
 BASE_ZKVM_IMAGE="${IMAGE_PREFIX}ere-base-${ZKVM}:${IMAGE_TAG}"
-CACHED_BASE_IMAGE="${IMAGE_PREFIX}ere-base:${CACHED_IMAGE_TAG}"
 CACHED_BASE_ZKVM_IMAGE="${IMAGE_PREFIX}ere-base-${ZKVM}:${CACHED_IMAGE_TAG}"

 # Pull or build ere-base and ere-base-$ZKVM locally
 if [ -n "$CACHED_IMAGE_TAG" ] \
-    && docker image pull "$CACHED_BASE_IMAGE" \
    && docker image pull "$CACHED_BASE_ZKVM_IMAGE";
 then
-    echo "Tagging ere-base from cache"
-    docker tag "$CACHED_BASE_IMAGE" "$BASE_IMAGE"
    echo "Tagging ere-base-$ZKVM from cache"
    docker tag "$CACHED_BASE_ZKVM_IMAGE" "$BASE_ZKVM_IMAGE"
 else
--- a/.github/workflows/build-and-push-images.yml
+++ b/.github/workflows/build-and-push-images.yml
@@ -8,9 +8,27 @@ on:
      - 'v*'

 jobs:
+  image_meta:
+    name: Get image metadata
+    runs-on: ubuntu-latest
+    outputs:
+      sha_tag: ${{ steps.meta.outputs.sha_tag }}
+      semver_tag: ${{ steps.meta.outputs.semver_tag }}
+      registry: ${{ steps.meta.outputs.registry }}
+    steps:
+      - name: Get image metadata
+        id: meta
+        run: |
+          GIT_SHA="${{ github.sha }}"
+          GIT_TAG="${{ github.ref_name }}"
+          echo "sha_tag=${GIT_SHA:0:7}" >> $GITHUB_OUTPUT
+          echo "semver_tag=${GIT_TAG#v}" >> $GITHUB_OUTPUT
+          echo "registry=ghcr.io/${{ github.repository }}" >> $GITHUB_OUTPUT
+
  build_and_push:
    name: Build and push docker image (${{ matrix.zkvm }})
    if: github.ref == 'refs/heads/master'
+    needs: image_meta
    runs-on: ubuntu-latest
    permissions:
      contents: read
@@ -18,17 +36,17 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        include:
-          - { zkvm: airbender, cuda: true  }
-          - { zkvm: jolt,      cuda: false }
-          - { zkvm: miden,     cuda: false }
-          - { zkvm: nexus,     cuda: false }
-          - { zkvm: openvm,    cuda: true  }
-          - { zkvm: pico,      cuda: false }
-          - { zkvm: risc0,     cuda: true  }
-          - { zkvm: sp1,       cuda: true  }
-          - { zkvm: ziren,     cuda: false }
-          - { zkvm: zisk,      cuda: true  }
+        zkvm:
+          - airbender
+          - jolt
+          - miden
+          - nexus
+          - openvm
+          - pico
+          - risc0
+          - sp1
+          - ziren
+          - zisk
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
@@ -43,74 +61,133 @@ jobs:
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}

-      - name: Compute image tag and registry
-        id: meta
-        run: |
-          GIT_SHA="${{ github.sha }}"
-          echo "tag=${GIT_SHA:0:7}" >> $GITHUB_OUTPUT
-          echo "registry=ghcr.io/${{ github.repository }}" >> $GITHUB_OUTPUT
-
      - name: Build ere-base and ere-base-${{ matrix.zkvm }} images
        run: |
          bash .github/scripts/build-image.sh \
            --zkvm ${{ matrix.zkvm }} \
-            --registry ${{ steps.meta.outputs.registry }} \
-            --tag ${{ steps.meta.outputs.tag }} \
+            --registry ${{ needs.image_meta.outputs.registry }} \
+            --tag ${{ needs.image_meta.outputs.sha_tag }} \
            --base

      - name: Push ere-base and ere-base-${{ matrix.zkvm }} images
        run: |
-          docker push ${{ steps.meta.outputs.registry }}/ere-base:${{ steps.meta.outputs.tag }}
-          docker push ${{ steps.meta.outputs.registry }}/ere-base-${{ matrix.zkvm }}:${{ steps.meta.outputs.tag }}
+          docker push ${{ needs.image_meta.outputs.registry }}/ere-base-${{ matrix.zkvm }}:${{ needs.image_meta.outputs.sha_tag }}

      - name: Build ere-compiler-${{ matrix.zkvm }} and ere-server-${{ matrix.zkvm }} images
        run: |
          bash .github/scripts/build-image.sh \
            --zkvm ${{ matrix.zkvm }} \
-            --registry ${{ steps.meta.outputs.registry }} \
-            --tag ${{ steps.meta.outputs.tag }} \
+            --registry ${{ needs.image_meta.outputs.registry }} \
+            --tag ${{ needs.image_meta.outputs.sha_tag }} \
            --compiler \
            --server

      - name: Push ere-compiler-${{ matrix.zkvm }} and ere-server-${{ matrix.zkvm }} images
        run: |
-          docker push ${{ steps.meta.outputs.registry }}/ere-compiler-${{ matrix.zkvm }}:${{ steps.meta.outputs.tag }}
-          docker push ${{ steps.meta.outputs.registry }}/ere-server-${{ matrix.zkvm }}:${{ steps.meta.outputs.tag }}
+          docker push ${{ needs.image_meta.outputs.registry }}/ere-compiler-${{ matrix.zkvm }}:${{ needs.image_meta.outputs.sha_tag }}
+          docker push ${{ needs.image_meta.outputs.registry }}/ere-server-${{ matrix.zkvm }}:${{ needs.image_meta.outputs.sha_tag }}
+
+  build_and_push_cuda:
+    name: Build and push CUDA docker image (${{ matrix.zkvm }})
+    if: github.ref == 'refs/heads/master'
+    needs: image_meta
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      fail-fast: false
+      matrix:
+        zkvm:
+          - airbender
+          - openvm
+          - risc0
+          - sp1
+          - zisk
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Free up disk space
+        run: bash .github/scripts/free-up-disk-space.sh
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}

      - name: Build ere-base and ere-base-${{ matrix.zkvm }} images with CUDA enabled
-        if: matrix.cuda
        run: |
          bash .github/scripts/build-image.sh \
            --zkvm ${{ matrix.zkvm }} \
-            --registry ${{ steps.meta.outputs.registry }} \
-            --tag ${{ steps.meta.outputs.tag }}-cuda \
+            --registry ${{ needs.image_meta.outputs.registry }} \
+            --tag ${{ needs.image_meta.outputs.sha_tag }}-cuda \
            --base \
            --cuda-archs '89,120'

      - name: Push ere-base and ere-base-${{ matrix.zkvm }} images with CUDA enabled
-        if: matrix.cuda
        run: |
-          docker push ${{ steps.meta.outputs.registry }}/ere-base:${{ steps.meta.outputs.tag }}-cuda
-          docker push ${{ steps.meta.outputs.registry }}/ere-base-${{ matrix.zkvm }}:${{ steps.meta.outputs.tag }}-cuda
+          docker push ${{ needs.image_meta.outputs.registry }}/ere-base-${{ matrix.zkvm }}:${{ needs.image_meta.outputs.sha_tag }}-cuda

      - name: Build ere-server-${{ matrix.zkvm }} image with CUDA enabled
-        if: matrix.cuda
        run: |
          bash .github/scripts/build-image.sh \
            --zkvm ${{ matrix.zkvm }} \
-            --registry ${{ steps.meta.outputs.registry }} \
-            --tag ${{ steps.meta.outputs.tag }}-cuda \
+            --registry ${{ needs.image_meta.outputs.registry }} \
+            --tag ${{ needs.image_meta.outputs.sha_tag }}-cuda \
            --server \
            --cuda-archs '89,120'

      - name: Push ere-server-${{ matrix.zkvm }} image with CUDA enabled
-        if: matrix.cuda
        run: |
-          docker push ${{ steps.meta.outputs.registry }}/ere-server-${{ matrix.zkvm }}:${{ steps.meta.outputs.tag }}-cuda
+          docker push ${{ needs.image_meta.outputs.registry }}/ere-server-${{ matrix.zkvm }}:${{ needs.image_meta.outputs.sha_tag }}-cuda
+
+  build_and_push_cluster:
+    name: Build and push cluster docker image (${{ matrix.zkvm }})
+    if: github.ref == 'refs/heads/master'
+    needs: image_meta
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    strategy:
+      fail-fast: false
+      matrix:
+        zkvm:
+          - zisk
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Free up disk space
+        run: bash .github/scripts/free-up-disk-space.sh
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build ere-cluster-${{ matrix.zkvm }} image with CUDA enabled
+        run: |
+          bash .github/scripts/build-image.sh \
+            --zkvm ${{ matrix.zkvm }} \
+            --registry ${{ needs.image_meta.outputs.registry }} \
+            --tag ${{ needs.image_meta.outputs.sha_tag }}-cuda \
+            --cluster \
+            --cuda-archs '89,120'
+
+      - name: Push ere-cluster-${{ matrix.zkvm }} image with CUDA enabled
+        run: |
+          docker push ${{ needs.image_meta.outputs.registry }}/ere-cluster-${{ matrix.zkvm }}:${{ needs.image_meta.outputs.sha_tag }}-cuda

  create_semver_tag:
    name: Tag images with SemVer (${{ matrix.zkvm }})
    if: startsWith(github.ref, 'refs/tags/')
+    needs: image_meta
    runs-on: ubuntu-latest
    permissions:
      contents: read
@@ -119,16 +196,16 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - { zkvm: airbender, cuda: true  }
-          - { zkvm: jolt,      cuda: false }
-          - { zkvm: miden,     cuda: false }
-          - { zkvm: nexus,     cuda: false }
-          - { zkvm: openvm,    cuda: true  }
-          - { zkvm: pico,      cuda: false }
-          - { zkvm: risc0,     cuda: true  }
-          - { zkvm: sp1,       cuda: true  }
-          - { zkvm: ziren,     cuda: false }
-          - { zkvm: zisk,      cuda: true  }
+          - { zkvm: airbender, cuda: true , cluster: false }
+          - { zkvm: jolt,      cuda: false, cluster: false }
+          - { zkvm: miden,     cuda: false, cluster: false }
+          - { zkvm: nexus,     cuda: false, cluster: false }
+          - { zkvm: openvm,    cuda: true , cluster: false }
+          - { zkvm: pico,      cuda: false, cluster: false }
+          - { zkvm: risc0,     cuda: true , cluster: false }
+          - { zkvm: sp1,       cuda: true , cluster: false }
+          - { zkvm: ziren,     cuda: false, cluster: false }
+          - { zkvm: zisk,      cuda: true , cluster: true  }
    steps:
      - name: Log in to GitHub Container Registry
        uses: docker/login-action@v3
@@ -139,44 +216,33 @@ jobs:

      - name: Add SemVer tag to images
        run: |
-          GIT_SHA="${{ github.sha }}"
-          GIT_SHA_TAG="${GIT_SHA:0:7}"
+          SHA_TAG="${{ needs.image_meta.outputs.sha_tag }}"
+          SEMVER_TAG="${{ needs.image_meta.outputs.semver_tag }}"

-          GIT_TAG="${{ github.ref_name }}"
-          SEMVER_TAG="${GIT_TAG#v}"
-
-          IMAGE_REGISTRY="ghcr.io/${{ github.repository }}"
-
-          for IMAGE in \
-            "ere-base" \
-            "ere-base-${{ matrix.zkvm }}" \
-            "ere-compiler-${{ matrix.zkvm }}" \
-            "ere-server-${{ matrix.zkvm }}"
-          do
-            echo "Tagging $IMAGE_REGISTRY/$IMAGE:$GIT_SHA_TAG as $SEMVER_TAG"
-            docker buildx imagetools create \
-              "$IMAGE_REGISTRY/$IMAGE:$GIT_SHA_TAG" \
-              --tag "$IMAGE_REGISTRY/$IMAGE:$SEMVER_TAG"
+          for IMAGE_KIND in base compiler server; do
+            IMAGE="${{ needs.image_meta.outputs.registry }}/ere-$IMAGE_KIND-${{ matrix.zkvm }}"
+            echo "Tagging $IMAGE:$SHA_TAG as $IMAGE:$SEMVER_TAG"
+            docker buildx imagetools create "$IMAGE:$SHA_TAG" --tag "$IMAGE:$SEMVER_TAG"
          done

      - name: Add SemVer tag to images with CUDA enabled
        if: matrix.cuda
        run: |
-          GIT_SHA="${{ github.sha }}"
-          GIT_SHA_TAG="${GIT_SHA:0:7}"
+          SHA_TAG="${{ needs.image_meta.outputs.sha_tag }}-cuda"
+          SEMVER_TAG="${{ needs.image_meta.outputs.semver_tag }}-cuda"

-          GIT_TAG="${{ github.ref_name }}"
-          SEMVER_TAG="${GIT_TAG#v}"
-
-          IMAGE_REGISTRY="ghcr.io/${{ github.repository }}"
-
-          for IMAGE in \
-            "ere-base" \
-            "ere-base-${{ matrix.zkvm }}" \
-            "ere-server-${{ matrix.zkvm }}"
-          do
-            echo "Tagging $IMAGE_REGISTRY/$IMAGE:${GIT_SHA_TAG}-cuda as ${SEMVER_TAG}-cuda"
-            docker buildx imagetools create \
-              "$IMAGE_REGISTRY/$IMAGE:${GIT_SHA_TAG}-cuda" \
-              --tag "$IMAGE_REGISTRY/$IMAGE:${SEMVER_TAG}-cuda"
+          for IMAGE_KIND in base server; do
+            IMAGE="${{ needs.image_meta.outputs.registry }}/ere-$IMAGE_KIND-${{ matrix.zkvm }}"
+            echo "Tagging $IMAGE:$SHA_TAG as $IMAGE:$SEMVER_TAG"
+            docker buildx imagetools create "$IMAGE:$SHA_TAG" --tag "$IMAGE:$SEMVER_TAG"
          done
+
+      - name: Add SemVer tag to cluster image with CUDA enabled
+        if: matrix.cluster
+        run: |
+          SHA_TAG="${{ needs.image_meta.outputs.sha_tag }}-cuda"
+          SEMVER_TAG="${{ needs.image_meta.outputs.semver_tag }}-cuda"
+
+          IMAGE="${{ needs.image_meta.outputs.registry }}/ere-cluster-${{ matrix.zkvm }}"
+          echo "Tagging $IMAGE:$SHA_TAG as $IMAGE:$SEMVER_TAG"
+          docker buildx imagetools create "$IMAGE:$SHA_TAG" --tag "$IMAGE:$SEMVER_TAG"
--- a/.github/workflows/test-zkvm-zisk.yml
+++ b/.github/workflows/test-zkvm-zisk.yml
@@ -16,4 +16,5 @@ jobs:
    with:
      zkvm: zisk
      cuda: true
+      cluster: true
      skip_prove_test: true
--- a/.github/workflows/test-zkvm.yml
+++ b/.github/workflows/test-zkvm.yml
@@ -12,6 +12,11 @@ on:
        required: false
        type: boolean
        default: false
+      cluster:
+        description: 'Whether to build cluster image'
+        required: false
+        type: boolean
+        default: false
      # Remove when we use larger runners, currently only needed to skip for zisk
      skip_prove_test:
        description: 'Whether to skip prove test and ere-dockerized test or not'
@@ -23,10 +28,11 @@ env:
  CARGO_TERM_COLOR: always

 jobs:
-  get_image_metadata:
+  image_meta:
    name: Get image metadata
    runs-on: ubuntu-latest
    outputs:
+      dockerfile_changed: ${{ steps.changed_files.outputs.any_changed }}
      image_registry: ${{ steps.image_meta.outputs.image_registry }}
      image_tag: ${{ steps.image_meta.outputs.image_tag }}
      cached_image_tag: ${{ steps.image_meta.outputs.cached_image_tag }}
@@ -66,7 +72,7 @@ jobs:
  build_image_cuda_check:
    name: Build image with CUDA enabled
    if: inputs.cuda
-    needs: get_image_metadata
+    needs: image_meta
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
@@ -77,29 +83,39 @@ jobs:

      - name: Pull or build ere-base and ere-base-${{ inputs.zkvm }} images with CUDA enabled
        run: |
-          CACHED_TAG="${{ needs.get_image_metadata.outputs.cached_image_tag }}"
+          CACHED_TAG="${{ needs.image_meta.outputs.cached_image_tag }}"
          if [ -n "$CACHED_TAG" ]; then
            CACHED_TAG="${CACHED_TAG}-cuda"
          fi
          bash .github/scripts/pull-or-build-base-zkvm-image.sh \
            --zkvm ${{ inputs.zkvm }} \
-            --registry ${{ needs.get_image_metadata.outputs.image_registry }} \
-            --tag ${{ needs.get_image_metadata.outputs.image_tag }}-cuda \
+            --registry ${{ needs.image_meta.outputs.image_registry }} \
+            --tag ${{ needs.image_meta.outputs.image_tag }}-cuda \
            --cached-tag "$CACHED_TAG" \
            --cuda-archs '89,120'

-      - name: Build ere-server-${{ inputs.zkvm }} CUDA image
+      - name: Build ere-server-${{ inputs.zkvm }} image with CUDA enabled
        run: |
          bash .github/scripts/build-image.sh \
            --zkvm ${{ inputs.zkvm }} \
-            --registry ${{ needs.get_image_metadata.outputs.image_registry }} \
-            --tag ${{ needs.get_image_metadata.outputs.image_tag }}-cuda \
+            --registry ${{ needs.image_meta.outputs.image_registry }} \
+            --tag ${{ needs.image_meta.outputs.image_tag }}-cuda \
            --server \
            --cuda-archs '89,120'

+      - name: Build ere-cluster-${{ inputs.zkvm }} image with CUDA enabled
+        if: ${{ inputs.cluster && needs.image_meta.outputs.dockerfile_changed == 'true' }}
+        run: |
+          bash .github/scripts/build-image.sh \
+            --zkvm ${{ inputs.zkvm }} \
+            --registry ${{ needs.image_meta.outputs.image_registry }} \
+            --tag ${{ needs.image_meta.outputs.image_tag }}-cuda \
+            --cluster \
+            --cuda-archs '89,120'
+
  clippy_via_docker:
    name: Clippy via Docker
-    needs: get_image_metadata
+    needs: image_meta
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
@@ -117,9 +133,9 @@ jobs:
        run: |
          bash .github/scripts/pull-or-build-base-zkvm-image.sh \
            --zkvm ${{ inputs.zkvm }} \
-            --registry ${{ needs.get_image_metadata.outputs.image_registry }} \
-            --tag ${{ needs.get_image_metadata.outputs.image_tag }} \
-            --cached-tag "${{ needs.get_image_metadata.outputs.cached_image_tag }}"
+            --registry ${{ needs.image_meta.outputs.image_registry }} \
+            --tag ${{ needs.image_meta.outputs.image_tag }} \
+            --cached-tag "${{ needs.image_meta.outputs.cached_image_tag }}"

      - name: Run cargo clippy for ere-${{ inputs.zkvm }} via Docker
        run: |
@@ -130,7 +146,7 @@ jobs:
            --volume $HOME/.cargo/registry:/usr/local/cargo/registry \
            --volume $HOME/.cargo/git:/usr/local/cargo/git \
            --workdir /ere \
-            ${{ needs.get_image_metadata.outputs.base_zkvm_image }} \
+            ${{ needs.image_meta.outputs.base_zkvm_image }} \
            /bin/bash"

          cat <<EOF | $DOCKER_CMD
@@ -148,7 +164,7 @@ jobs:

  test_via_docker:
    name: Test via Docker
-    needs: get_image_metadata
+    needs: image_meta
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
@@ -166,9 +182,9 @@ jobs:
        run: |
          bash .github/scripts/pull-or-build-base-zkvm-image.sh \
            --zkvm ${{ inputs.zkvm }} \
-            --registry ${{ needs.get_image_metadata.outputs.image_registry }} \
-            --tag ${{ needs.get_image_metadata.outputs.image_tag }} \
-            --cached-tag "${{ needs.get_image_metadata.outputs.cached_image_tag }}"
+            --registry ${{ needs.image_meta.outputs.image_registry }} \
+            --tag ${{ needs.image_meta.outputs.image_tag }} \
+            --cached-tag "${{ needs.image_meta.outputs.cached_image_tag }}"

      - name: Run cargo test for ere-${{ inputs.zkvm }} via Docker
        run: |
@@ -179,7 +195,7 @@ jobs:
            --volume $HOME/.cargo/registry:/usr/local/cargo/registry \
            --volume $HOME/.cargo/git:/usr/local/cargo/git \
            --workdir /ere \
-            ${{ needs.get_image_metadata.outputs.base_zkvm_image }} \
+            ${{ needs.image_meta.outputs.base_zkvm_image }} \
            /bin/bash"

          cat <<EOF | $DOCKER_CMD
@@ -195,7 +211,7 @@ jobs:

  test_ere_dockerized:
    name: Test ere-dockerized with the selected zkVM
-    needs: get_image_metadata
+    needs: image_meta
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
@@ -218,21 +234,21 @@ jobs:
        run: |
          bash .github/scripts/pull-or-build-base-zkvm-image.sh \
            --zkvm ${{ inputs.zkvm }} \
-            --registry ${{ needs.get_image_metadata.outputs.image_registry }} \
-            --tag ${{ needs.get_image_metadata.outputs.image_tag }} \
-            --cached-tag "${{ needs.get_image_metadata.outputs.cached_image_tag }}"
+            --registry ${{ needs.image_meta.outputs.image_registry }} \
+            --tag ${{ needs.image_meta.outputs.image_tag }} \
+            --cached-tag "${{ needs.image_meta.outputs.cached_image_tag }}"

          # Build ere-compiler-${{ inputs.zkvm }} and ere-server-${{ inputs.zkvm }}
          bash .github/scripts/build-image.sh \
            --zkvm ${{ inputs.zkvm }} \
-            --registry ${{ needs.get_image_metadata.outputs.image_registry }} \
-            --tag ${{ needs.get_image_metadata.outputs.image_tag }} \
+            --registry ${{ needs.image_meta.outputs.image_registry }} \
+            --tag ${{ needs.image_meta.outputs.image_tag }} \
            --compiler \
            --server

      - name: Run cargo test for ere-${{ inputs.zkvm }} via ere-dockerized
        env:
-          ERE_IMAGE_REGISTRY: ${{ needs.get_image_metadata.outputs.image_registry }}
+          ERE_IMAGE_REGISTRY: ${{ needs.image_meta.outputs.image_registry }}
        run: |
          cargo test --release --package ere-dockerized \
            -- ${{ inputs.zkvm }} ${{ inputs.skip_prove_test && '--skip prove' || ''  }} --test-threads=1