Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: update zkllvm to 0.1.5 #50

Merged
merged 2 commits into from
Nov 10, 2023
Merged

ci: update zkllvm to 0.1.5 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a446e2b
ci: update versions
NickVolynkin Nov 10, 2023
3e7861b
ci: remove proving from the pipeline
NickVolynkin Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
```

Expand Down
8 changes: 4 additions & 4 deletions scripts/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down