github/ere
1
1
Fork 0
mirror of https://github.com/eth-act/ere.git synced 2026-04-03 03:00:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor CI (#167)

Browse Source
This commit is contained in:
Han
2025-10-10 22:26:46 +08:00
committed by GitHub
parent 3d890355f0
commit ad4e211af7
4 changed files with 193 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.github/scripts/free-up-disk-space.sh vendored Normal file
View File

@@ -0,0 +1,9 @@
#!/bin/bash
set -e -o pipefail
df -h /
sudo rm -rf /usr/share/dotnet
sudo rm -rf /usr/local/lib/android
sudo rm -rf /opt/hostedtoolcache
df -h /

39
.github/scripts/pull-or-build-base-zkvm-image.sh vendored Normal file
View File

@@ -0,0 +1,39 @@
#!/bin/bash
set -e -o pipefail
ZKVM=$1
IMAGE_REPO=$2
IMAGE_TAG=$3
CACHED_IMAGE_TAG=$4
BASE_IMAGE="$IMAGE_REPO/ere-base:$IMAGE_TAG"
BASE_ZKVM_IMAGE="$IMAGE_REPO/ere-base-$ZKVM:$IMAGE_TAG"
CACHED_BASE_IMAGE="$IMAGE_REPO/ere-base:$CACHED_IMAGE_TAG"
CACHED_BASE_ZKVM_IMAGE="$IMAGE_REPO/ere-base-$ZKVM:$CACHED_IMAGE_TAG"
# Pull or build ere-base locally
if docker image pull $CACHED_BASE_IMAGE; then
echo "Tagging ere-base from cache"
docker tag $CACHED_BASE_IMAGE $BASE_IMAGE
else
echo "Building ere-base"
docker build \
--file docker/base/Dockerfile.base \
--tag $BASE_IMAGE \
.
fi
# Pull or build ere-base-$ZKVM locally
if docker image pull $CACHED_BASE_ZKVM_IMAGE; then
echo "Tagging ere-base-$ZKVM from cache"
docker tag $CACHED_BASE_ZKVM_IMAGE $BASE_ZKVM_IMAGE
else
echo "Building ere-base-$ZKVM"
docker build \
--file docker/$ZKVM/Dockerfile.base \
--tag $BASE_ZKVM_IMAGE \
--build-arg BASE_IMAGE=$BASE_IMAGE \
--build-arg CI=1 \
.
fi

170
.github/workflows/test-zkvm.yml vendored
View File

@@ -35,24 +35,21 @@ jobs:
contents: read
packages: write
outputs:
image_tag: ${{ steps.image_tag.outputs.image_tag }}
base_image: ${{ steps.image_tag.outputs.base_image }}
base_zkvm_image: ${{ steps.image_tag.outputs.base_zkvm_image }}
compiler_zkvm_image: ${{ steps.image_tag.outputs.compiler_zkvm_image }}
server_zkvm_image: ${{ steps.image_tag.outputs.server_zkvm_image }}
image_repo: ${{ steps.image_meta.outputs.image_repo }}
image_tag: ${{ steps.image_meta.outputs.image_tag }}
cached_image_tag: ${{ steps.image_meta.outputs.cached_image_tag }}
base_image: ${{ steps.image_meta.outputs.base_image }}
base_zkvm_image: ${{ steps.image_meta.outputs.base_zkvm_image }}
compiler_zkvm_image: ${{ steps.image_meta.outputs.compiler_zkvm_image }}
server_zkvm_image: ${{ steps.image_meta.outputs.server_zkvm_image }}
steps:
- name: Free up disk space
if: ${{ inputs.free_up_disk_space }}
run: |
df -h /
sudo rm -rf /usr/share/dotnet
sudo rm -rf /usr/local/lib/android
sudo rm -rf /opt/hostedtoolcache
df -h /
- name: Checkout repository
uses: actions/checkout@v4
- name: Free up disk space
if: ${{ inputs.free_up_disk_space }}
run: bash .github/scripts/free-up-disk-space.sh
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
@@ -72,8 +69,8 @@ jobs:
docker/${{ inputs.zkvm }}/**
scripts/sdk_installers/install_${{ inputs.zkvm }}_sdk.sh
- name: Get image version and tags of ere-base and ere-base-${{ inputs.zkvm }}
id: image_tag
- name: Get image metadata
id: image_meta
run: |
ZKVM_CRATE_VERSION=$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[] | select(.name == "ere-${{ inputs.zkvm }}") | .version')
@@ -88,12 +85,14 @@ jobs:
CACHED_IMAGE_TAG="$ZKVM_CRATE_VERSION-${CACHED_GIT_REV:0:7}"
IMAGE_REPO="ghcr.io/${{ github.repository }}"
BASE_IMAGE="$IMAGE_REPO/ere-base:$CACHED_IMAGE_TAG"
BASE_ZKVM_IMAGE="$IMAGE_REPO/ere-base-${{ inputs.zkvm }}:$CACHED_IMAGE_TAG"
COMPILER_ZKVM_IMAGE="$IMAGE_REPO/ere-compiler-${{ inputs.zkvm }}:$CACHED_IMAGE_TAG"
SERVER_ZKVM_IMAGE="$IMAGE_REPO/ere-server-${{ inputs.zkvm }}:$CACHED_IMAGE_TAG"
BASE_IMAGE="$IMAGE_REPO/ere-base:$IMAGE_TAG"
BASE_ZKVM_IMAGE="$IMAGE_REPO/ere-base-${{ inputs.zkvm }}:$IMAGE_TAG"
COMPILER_ZKVM_IMAGE="$IMAGE_REPO/ere-compiler-${{ inputs.zkvm }}:$IMAGE_TAG"
SERVER_ZKVM_IMAGE="$IMAGE_REPO/ere-server-${{ inputs.zkvm }}:$IMAGE_TAG"
echo "image_repo=$IMAGE_REPO" >> $GITHUB_OUTPUT
echo "image_tag=$IMAGE_TAG" >> $GITHUB_OUTPUT
echo "cached_image_tag=$CACHED_IMAGE_TAG" >> $GITHUB_OUTPUT
echo "base_image=$BASE_IMAGE" >> $GITHUB_OUTPUT
echo "base_zkvm_image=$BASE_ZKVM_IMAGE" >> $GITHUB_OUTPUT
echo "compiler_zkvm_image=$COMPILER_ZKVM_IMAGE" >> $GITHUB_OUTPUT
@@ -106,7 +105,7 @@ jobs:
context: .
file: docker/base/Dockerfile.base
push: true
tags: ${{ steps.image_tag.outputs.base_image }}
tags: ${{ steps.image_meta.outputs.base_image }}
- name: Build ere-base-${{ inputs.zkvm }} image
if: (github.event_name == 'push' && github.ref == 'refs/heads/master') || (github.event.pull_request.head.repo.full_name == github.repository && steps.changed_files.outputs.any_changed == 'true')
@@ -115,9 +114,9 @@ jobs:
context: .
file: docker/${{ inputs.zkvm }}/Dockerfile.base
push: true
tags: ${{ steps.image_tag.outputs.base_zkvm_image }}
tags: ${{ steps.image_meta.outputs.base_zkvm_image }}
build-args: |
BASE_IMAGE=${{ steps.image_tag.outputs.base_image }}
BASE_IMAGE=${{ steps.image_meta.outputs.base_image }}
CI=1
- name: Build ere-compiler-${{ inputs.zkvm }} image
@@ -127,9 +126,9 @@ jobs:
context: .
file: docker/${{ inputs.zkvm }}/Dockerfile.compiler
push: true
tags: ${{ steps.image_tag.outputs.compiler_zkvm_image }}
tags: ${{ steps.image_meta.outputs.compiler_zkvm_image }}
build-args: |
BASE_ZKVM_IMAGE=${{ steps.image_tag.outputs.base_zkvm_image }}
BASE_ZKVM_IMAGE=${{ steps.image_meta.outputs.base_zkvm_image }}
- name: Build ere-server-${{ inputs.zkvm }} image
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
@@ -138,9 +137,9 @@ jobs:
context: .
file: docker/${{ inputs.zkvm }}/Dockerfile.server
push: true
tags: ${{ steps.image_tag.outputs.server_zkvm_image }}
tags: ${{ steps.image_meta.outputs.server_zkvm_image }}
build-args: |
BASE_ZKVM_IMAGE=${{ steps.image_tag.outputs.base_zkvm_image }}
BASE_ZKVM_IMAGE=${{ steps.image_meta.outputs.base_zkvm_image }}
RUSTFLAGS=
clippy_via_docker:
@@ -148,40 +147,25 @@ jobs:
needs: build_image
runs-on: ubuntu-latest
steps:
- name: Free up disk space
if: ${{ inputs.free_up_disk_space }}
run: |
df -h /
sudo rm -rf /usr/share/dotnet
sudo rm -rf /usr/local/lib/android
sudo rm -rf /opt/hostedtoolcache
df -h /
- name: Checkout repository
uses: actions/checkout@v4
- name: Free up disk space
if: ${{ inputs.free_up_disk_space }}
run: bash .github/scripts/free-up-disk-space.sh
- name: Cache dependencies
uses: Swatinem/rust-cache@v2
with:
key: rust-${{ inputs.toolchain }}-${{ inputs.zkvm }}-${{ hashFiles('Cargo.lock') }}
- name: Pull images or build locally
- name: Pull base zkvm image or build locally
run: |
# Pull or build ere-base-${{ inputs.zkvm }} locally
if ! docker image pull ${{ needs.build_image.outputs.base_zkvm_image }}; then
echo "Building ere-base"
docker build \
--file docker/base/Dockerfile.base \
--tag ${{ needs.build_image.outputs.base_image }} \
.
echo "Building ere-base-${{ inputs.zkvm }}"
docker build \
--file docker/${{ inputs.zkvm }}/Dockerfile.base \
--tag ${{ needs.build_image.outputs.base_zkvm_image }} \
--build-arg BASE_IMAGE=${{ needs.build_image.outputs.base_image }} \
.
fi
bash .github/scripts/pull-or-build-base-zkvm-image.sh \
${{ inputs.zkvm }} \
${{ needs.build_image.outputs.image_repo }} \
${{ needs.build_image.outputs.image_tag }} \
${{ needs.build_image.outputs.cached_image_tag }}
- name: Run cargo clippy for ere-${{ inputs.zkvm }} via Docker
run: |
@@ -211,40 +195,25 @@ jobs:
needs: build_image
runs-on: ubuntu-latest
steps:
- name: Free up disk space
if: ${{ inputs.free_up_disk_space }}
run: |
df -h /
sudo rm -rf /usr/share/dotnet
sudo rm -rf /usr/local/lib/android
sudo rm -rf /opt/hostedtoolcache
df -h /
- name: Checkout repository
uses: actions/checkout@v4
- name: Free up disk space
if: ${{ inputs.free_up_disk_space }}
run: bash .github/scripts/free-up-disk-space.sh
- name: Cache dependencies
uses: Swatinem/rust-cache@v2
with:
key: rust-${{ inputs.toolchain }}-${{ inputs.zkvm }}-${{ hashFiles('Cargo.lock') }}
- name: Pull images or build locally
- name: Pull base zkvm image or build locally
run: |
# Pull or build ere-base-${{ inputs.zkvm }} locally
if ! docker image pull ${{ needs.build_image.outputs.base_zkvm_image }}; then
echo "Building ere-base"
docker build \
--file docker/base/Dockerfile.base \
--tag ${{ needs.build_image.outputs.base_image }} \
.
echo "Building ere-base-${{ inputs.zkvm }}"
docker build \
--file docker/${{ inputs.zkvm }}/Dockerfile.base \
--tag ${{ needs.build_image.outputs.base_zkvm_image }} \
--build-arg BASE_IMAGE=${{ needs.build_image.outputs.base_image }} \
.
fi
bash .github/scripts/pull-or-build-base-zkvm-image.sh \
${{ inputs.zkvm }} \
${{ needs.build_image.outputs.image_repo }} \
${{ needs.build_image.outputs.image_tag }} \
${{ needs.build_image.outputs.cached_image_tag }}
- name: Run cargo test for ere-${{ inputs.zkvm }} via Docker
run: |
@@ -260,10 +229,8 @@ jobs:
cat <<EOF | $DOCKER_CMD
set -e -o pipefail
CARGO_BUILD_CMD="cargo test --release --package ere-${{ inputs.zkvm }} --no-run --message-format json"
EXEC=\$(RUSTFLAGS=-Ctarget-cpu=native \$CARGO_BUILD_CMD \
| jq -r 'select(.executable) | select(.package_id | contains("ere-${{ inputs.zkvm }}")) | .executable')
\$EXEC ${{ inputs.skip_prove_test && '--skip prove' || '' }}
cargo test --release --package ere-${{ inputs.zkvm }} \
-- ${{ inputs.skip_prove_test && '--skip prove' || '' }}
chown -R $(id -u):$(id -g) ~/.cargo
chown -R $(id -u):$(id -g) target
@@ -272,21 +239,15 @@ jobs:
test_ere_dockerized:
name: Test ere-dockerized with the selected zkVM
needs: build_image
if: ${{ ! inputs.skip_prove_test }}
runs-on: ubuntu-latest
steps:
- name: Free up disk space
if: ${{ inputs.free_up_disk_space }}
run: |
df -h /
sudo rm -rf /usr/share/dotnet
sudo rm -rf /usr/local/lib/android
sudo rm -rf /opt/hostedtoolcache
df -h /
- name: Checkout repository
uses: actions/checkout@v4
- name: Free up disk space
if: ${{ inputs.free_up_disk_space }}
run: bash .github/scripts/free-up-disk-space.sh
- name: Install protoc
run: |
sudo apt-get update
@@ -304,24 +265,11 @@ jobs:
- name: Pull images or build locally
run: |
# Pull or build ere-base locally
if ! docker image pull ${{ needs.build_image.outputs.base_image }}; then
echo "Building ere-base"
docker build \
--file docker/base/Dockerfile.base \
--tag ${{ needs.build_image.outputs.base_image }} \
.
fi
# Pull or build ere-base-${{ inputs.zkvm }} locally
if ! docker image pull ${{ needs.build_image.outputs.base_zkvm_image }}; then
echo "Building ere-base-${{ inputs.zkvm }}"
docker build \
--file docker/${{ inputs.zkvm }}/Dockerfile.base \
--tag ${{ needs.build_image.outputs.base_zkvm_image }} \
--build-arg BASE_IMAGE=${{ needs.build_image.outputs.base_image }} \
.
fi
bash .github/scripts/pull-or-build-base-zkvm-image.sh \
${{ inputs.zkvm }} \
${{ needs.build_image.outputs.image_repo }} \
${{ needs.build_image.outputs.image_tag }} \
${{ needs.build_image.outputs.cached_image_tag }}
# Build ere-compiler-${{ inputs.zkvm }}
echo "Building ere-compiler-${{ inputs.zkvm }}"
@@ -345,4 +293,6 @@ jobs:
docker image tag ${{ needs.build_image.outputs.server_zkvm_image }} ere-server-${{ inputs.zkvm }}:${{ needs.build_image.outputs.image_tag }}
- name: Run cargo test for ere-${{ inputs.zkvm }} via ere-dockerized
run: cargo test --release --package ere-dockerized -- ${{ inputs.zkvm }}
run: |
cargo test --release --package ere-dockerized \
-- ${{ inputs.zkvm }} ${{ inputs.skip_prove_test && '--skip prove' || '' }}