From e7572f16b14e5b0c6a1186c643376cdb6984d9e7 Mon Sep 17 00:00:00 2001 From: Nick Volynkin Date: Wed, 8 Nov 2023 15:50:49 +0200 Subject: [PATCH 1/3] ci: update zkllvm to 0.1.0 --- .github/workflows/main.yml | 2 +- Dockerfile | 2 +- README.md | 2 +- scripts/run.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bffa79d..d1da6e3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ concurrency: cancel-in-progress: true env: - ZKLLVM_VERSION: 0.0.86 + ZKLLVM_VERSION: 0.1.0 TOOLCHAIN_VERSION: 0.0.37 jobs: diff --git a/Dockerfile b/Dockerfile index e15f234..191d6b3 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.0 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..ae11886 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ 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.0 docker pull ghcr.io/nilfoundation/zkllvm-template:${ZKLLVM_VERSION} TOOLCHAIN_VERSION=0.0.37 diff --git a/scripts/run.sh b/scripts/run.sh index 4299257..616055b 100755 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -18,7 +18,7 @@ REPO_ROOT="$SCRIPT_DIR/.." # export TOOLCHAIN_VERSION=0.0.33 # If unset, default values will be used: -echo "using nilfoundation/zkllvm-template:${ZKLLVM_VERSION:=0.0.86}" +echo "using nilfoundation/zkllvm-template:${ZKLLVM_VERSION:=0.1.0}" echo "using nilfoundation/proof-market-toolchain:${TOOLCHAIN_VERSION:=0.0.37}" # podman is a safer option for using on CI machines From f9f4d4d0a675273cc3db1b96919db77cc41989b9 Mon Sep 17 00:00:00 2001 From: Nick Volynkin Date: Wed, 8 Nov 2023 21:27:59 +0200 Subject: [PATCH 2/3] ci: update zkllvm to 0.1.1 --- .github/workflows/main.yml | 2 +- Dockerfile | 2 +- README.md | 2 +- scripts/run.sh | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d1da6e3..aa54e0f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ concurrency: cancel-in-progress: true env: - ZKLLVM_VERSION: 0.1.0 + ZKLLVM_VERSION: 0.1.1 TOOLCHAIN_VERSION: 0.0.37 jobs: diff --git a/Dockerfile b/Dockerfile index 191d6b3..2f86a8d 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.1.0 +ARG ZKLLVM_VERSION=0.1.1 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 ae11886..01e06c2 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ 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.1.0 +ZKLLVM_VERSION=0.1.1 docker pull ghcr.io/nilfoundation/zkllvm-template:${ZKLLVM_VERSION} TOOLCHAIN_VERSION=0.0.37 diff --git a/scripts/run.sh b/scripts/run.sh index 616055b..391e695 100755 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -14,11 +14,11 @@ 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.1 +# export TOOLCHAIN_VERSION=0.0.39 # If unset, default values will be used: -echo "using nilfoundation/zkllvm-template:${ZKLLVM_VERSION:=0.1.0}" +echo "using nilfoundation/zkllvm-template:${ZKLLVM_VERSION:=0.1.1}" echo "using nilfoundation/proof-market-toolchain:${TOOLCHAIN_VERSION:=0.0.37}" # podman is a safer option for using on CI machines From 8256f45d96e4a7a60165e8d81b1d22184e7acf63 Mon Sep 17 00:00:00 2001 From: Nick Volynkin Date: Wed, 8 Nov 2023 20:48:47 +0200 Subject: [PATCH 3/3] ci: update proof-market-toolchain to 0.0.38 --- .github/workflows/main.yml | 2 +- README.md | 2 +- scripts/run.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aa54e0f..77d9469 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ concurrency: env: ZKLLVM_VERSION: 0.1.1 - TOOLCHAIN_VERSION: 0.0.37 + TOOLCHAIN_VERSION: 0.0.38 jobs: test-zkllvm-workflow: diff --git a/README.md b/README.md index 01e06c2..55f199f 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ In the tutorial, we'll use the latest compatible versions of both images: ZKLLVM_VERSION=0.1.1 docker pull ghcr.io/nilfoundation/zkllvm-template:${ZKLLVM_VERSION} -TOOLCHAIN_VERSION=0.0.37 +TOOLCHAIN_VERSION=0.0.38 docker pull ghcr.io/nilfoundation/proof-market-toolchain:${TOOLCHAIN_VERSION} ``` diff --git a/scripts/run.sh b/scripts/run.sh index 391e695..35825ea 100755 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -15,11 +15,11 @@ REPO_ROOT="$SCRIPT_DIR/.." # Set image versions in the environment before running this script: # export ZKLLVM_VERSION=0.1.1 -# export TOOLCHAIN_VERSION=0.0.39 +# export TOOLCHAIN_VERSION=0.0.38 # If unset, default values will be used: echo "using nilfoundation/zkllvm-template:${ZKLLVM_VERSION:=0.1.1}" -echo "using nilfoundation/proof-market-toolchain:${TOOLCHAIN_VERSION:=0.0.37}" +echo "using nilfoundation/proof-market-toolchain:${TOOLCHAIN_VERSION:=0.0.38}" # podman is a safer option for using on CI machines if ! command -v podman; then