From a446e2b4b241652ebfa60a031be55f34cdc4f61a Mon Sep 17 00:00:00 2001 From: Nick Volynkin Date: Fri, 10 Nov 2023 12:54:26 +0200 Subject: [PATCH 1/2] ci: update versions * zkLLVM to 0.1.5 * Proof Market toolchain to 0.0.39 --- .github/workflows/main.yml | 4 ++-- Dockerfile | 2 +- README.md | 4 ++-- scripts/run.sh | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bffa79d..0115455 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,8 +14,8 @@ concurrency: cancel-in-progress: true env: - ZKLLVM_VERSION: 0.0.86 - TOOLCHAIN_VERSION: 0.0.37 + ZKLLVM_VERSION: 0.1.5 + TOOLCHAIN_VERSION: 0.0.39 jobs: test-zkllvm-workflow: diff --git a/Dockerfile b/Dockerfile index e15f234..b65fdad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # build to ghcr.io/nilfoundation/zkllvm-template:latest FROM ghcr.io/nilfoundation/build-base:1.76.0 -ARG ZKLLVM_VERSION=0.0.86 +ARG ZKLLVM_VERSION=0.1.5 RUN DEBIAN_FRONTEND=noninteractive \ echo 'deb [trusted=yes] http://deb.nil.foundation/ubuntu/ all main' >> /etc/apt/sources.list \ diff --git a/README.md b/README.md index 1ea755c..16ddcb5 100644 --- a/README.md +++ b/README.md @@ -76,10 +76,10 @@ Both images are versioned according to the products they contain. In the tutorial, we'll use the latest compatible versions of both images: ```bash -ZKLLVM_VERSION=0.0.86 +ZKLLVM_VERSION=0.1.5 docker pull ghcr.io/nilfoundation/zkllvm-template:${ZKLLVM_VERSION} -TOOLCHAIN_VERSION=0.0.37 +TOOLCHAIN_VERSION=0.0.39 docker pull ghcr.io/nilfoundation/proof-market-toolchain:${TOOLCHAIN_VERSION} ``` diff --git a/scripts/run.sh b/scripts/run.sh index 4299257..3972168 100755 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -14,12 +14,12 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) REPO_ROOT="$SCRIPT_DIR/.." # Set image versions in the environment before running this script: -# export ZKLLVM_VERSION=0.0.58 -# export TOOLCHAIN_VERSION=0.0.33 +# export ZKLLVM_VERSION=0.1.5 +# export TOOLCHAIN_VERSION=0.0.39 # If unset, default values will be used: -echo "using nilfoundation/zkllvm-template:${ZKLLVM_VERSION:=0.0.86}" -echo "using nilfoundation/proof-market-toolchain:${TOOLCHAIN_VERSION:=0.0.37}" +echo "using nilfoundation/zkllvm-template:${ZKLLVM_VERSION:=0.1.5}" +echo "using nilfoundation/proof-market-toolchain:${TOOLCHAIN_VERSION:=0.0.39}" # podman is a safer option for using on CI machines if ! command -v podman; then From 3e7861b5ced0c8f491dd567a96ed75578c043e89 Mon Sep 17 00:00:00 2001 From: Nick Volynkin Date: Fri, 10 Nov 2023 13:47:51 +0200 Subject: [PATCH 2/2] ci: remove proving from the pipeline Waiting for a compatible toolchain version. --- .github/workflows/main.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0115455..1f0efdb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,12 +31,3 @@ jobs: - name: Build a statement for the Proof Market run: scripts/run.sh --verbose --docker build_statement - - - name: Calculate a proof - run: scripts/run.sh --verbose --docker prove - - - name: Make constraint and assignment table for EVM verifier endpoint - run: scripts/run.sh --verbose --docker build_constraint - - - name: Build circuit parameters for EVM verifier endpoint - run: scripts/run.sh --verbose --docker build_circuit_params