Skip to content

Commit

Permalink
fix(ci): Use the same nightly rust (#530)
Browse files Browse the repository at this point in the history
## What ❔

<!-- What are the changes this PR brings about? -->
<!-- Example: This PR adds a PR template to the repo. -->
<!-- (For bigger PRs adding more context is appreciated) -->

## Why ❔

<!-- Why are these changes done? What goal do they contribute to? What
are the principles behind them? -->
<!-- Example: PR templates ensure PR reviewers, observers, and future
iterators are in context about the evolution of repos. -->

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [ ] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [ ] Tests for the changes have been added / updated.
- [ ] Documentation comments have been added / updated.
- [ ] Code has been formatted via `zk fmt` and `zk lint`.

Signed-off-by: Danil <deniallugo@gmail.com>
  • Loading branch information
Deniallugo committed Nov 21, 2023
1 parent cebe233 commit 67ef133
Show file tree
Hide file tree
Showing 20 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-core-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
DOCKER_ACTION: ${{ inputs.action }}
COMPONENT: ${{ matrix.component }}
run: |
ci_run rustup default nightly-2023-07-21
ci_run rustup default nightly-2023-08-21
ci_run zk docker $DOCKER_ACTION $COMPONENT -- --public
- name: Show sccache stats
if: always()
Expand Down
4 changes: 2 additions & 2 deletions docker/circuit-synthesizer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
PATH=/usr/local/cargo/bin:$PATH

RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
rustup install nightly-2023-07-21 && \
rustup default nightly-2023-07-21
rustup install nightly-2023-08-21 && \
rustup default nightly-2023-08-21

WORKDIR /usr/src/zksync
COPY . .
Expand Down
4 changes: 2 additions & 2 deletions docker/contract-verifier/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
PATH=/usr/local/cargo/bin:$PATH

RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
rustup install nightly-2023-07-21 && \
rustup default nightly-2023-07-21
rustup install nightly-2023-08-21 && \
rustup default nightly-2023-08-21

WORKDIR /usr/src/zksync
COPY . .
Expand Down
4 changes: 2 additions & 2 deletions docker/cross-external-nodes-checker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
PATH=/usr/local/cargo/bin:$PATH

RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
rustup install nightly-2023-07-21 && \
rustup default nightly-2023-07-21
rustup install nightly-2023-08-21 && \
rustup default nightly-2023-08-21

WORKDIR /usr/src/zksync
COPY . .
Expand Down
4 changes: 2 additions & 2 deletions docker/external-node/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
PATH=/usr/local/cargo/bin:$PATH

RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
rustup install nightly-2023-07-21 && \
rustup default nightly-2023-07-21
rustup install nightly-2023-08-21 && \
rustup default nightly-2023-08-21

WORKDIR /usr/src/zksync
COPY . .
Expand Down
4 changes: 2 additions & 2 deletions docker/proof-fri-compressor/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
PATH=/usr/local/cargo/bin:$PATH

RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
rustup install nightly-2023-07-21 && \
rustup default nightly-2023-07-21
rustup install nightly-2023-08-21 && \
rustup default nightly-2023-08-21

WORKDIR /usr/src/zksync
COPY . .
Expand Down
4 changes: 2 additions & 2 deletions docker/prover-fri-gateway/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
PATH=/usr/local/cargo/bin:$PATH

RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
rustup install nightly-2023-07-21 && \
rustup default nightly-2023-07-21
rustup install nightly-2023-08-21 && \
rustup default nightly-2023-08-21

WORKDIR /usr/src/zksync
COPY . .
Expand Down
4 changes: 2 additions & 2 deletions docker/prover-fri/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
PATH=/usr/local/cargo/bin:$PATH

RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
rustup install nightly-2023-07-21 && \
rustup default nightly-2023-07-21
rustup install nightly-2023-08-21 && \
rustup default nightly-2023-08-21

WORKDIR /usr/src/zksync
COPY . .
Expand Down
4 changes: 2 additions & 2 deletions docker/prover-gpu-fri/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
ENV CUDAARCHS=89

RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
rustup install nightly-2023-07-21 && \
rustup default nightly-2023-07-21
rustup install nightly-2023-08-21 && \
rustup default nightly-2023-08-21

RUN curl -Lo cmake-3.24.2-linux-x86_64.sh https://github.com/Kitware/CMake/releases/download/v3.24.2/cmake-3.24.2-linux-x86_64.sh && \
chmod +x cmake-3.24.2-linux-x86_64.sh && \
Expand Down
4 changes: 2 additions & 2 deletions docker/prover/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
PATH=/usr/local/cargo/bin:$PATH

RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
rustup install nightly-2023-07-21 && \
rustup default nightly-2023-07-21
rustup install nightly-2023-08-21 && \
rustup default nightly-2023-08-21

WORKDIR /usr/src/zksync

Expand Down
4 changes: 2 additions & 2 deletions docker/server-v2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
PATH=/usr/local/cargo/bin:$PATH

RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
rustup install nightly-2023-07-21 && \
rustup default nightly-2023-07-21
rustup install nightly-2023-08-21 && \
rustup default nightly-2023-08-21

RUN cargo build --release --features=rocksdb/io-uring

Expand Down
4 changes: 2 additions & 2 deletions docker/witness-generator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
PATH=/usr/local/cargo/bin:$PATH

RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
rustup install nightly-2023-07-21 && \
rustup default nightly-2023-07-21
rustup install nightly-2023-08-21 && \
rustup default nightly-2023-08-21

WORKDIR /usr/src/zksync
COPY . .
Expand Down
4 changes: 2 additions & 2 deletions docker/witness-vector-generator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
PATH=/usr/local/cargo/bin:$PATH

RUN curl https://sh.rustup.rs -sSf | bash -s -- -y && \
rustup install nightly-2023-07-21 && \
rustup default nightly-2023-07-21
rustup install nightly-2023-08-21 && \
rustup default nightly-2023-08-21

WORKDIR /usr/src/zksync
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion docker/zk-environment/20.04_amd64_cuda_11_8.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ RUN echo "deb http://packages.cloud.google.com/apt cloud-sdk main" > /etc/apt/so
gcloud config set metrics/environment github_docker_image

RUN wget -c -O - https://sh.rustup.rs | bash -s -- -y
RUN rustup install nightly-2023-07-21
RUN rustup install nightly-2023-08-21
RUN rustup default stable
RUN cargo install --version=0.5.13 sqlx-cli
RUN cargo install cargo-nextest
Expand Down
2 changes: 1 addition & 1 deletion docker/zk-environment/20.04_amd64_cuda_12_0.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ RUN echo "deb http://packages.cloud.google.com/apt cloud-sdk main" > /etc/apt/so
gcloud config set metrics/environment github_docker_image

RUN wget -c -O - https://sh.rustup.rs | bash -s -- -y
RUN rustup install nightly-2023-07-21
RUN rustup install nightly-2023-08-21
RUN rustup default stable
RUN cargo install --version=0.5.13 sqlx-cli
RUN cargo install cargo-nextest
Expand Down
4 changes: 2 additions & 2 deletions docker/zk-environment/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -133,5 +133,5 @@ ENV RUSTC_WRAPPER=/usr/local/cargo/bin/sccache

FROM rust-lightweight as rust-lightweight-nightly

RUN rustup install nightly-2023-07-21 && \
rustup default nightly-2023-07-21
RUN rustup install nightly-2023-08-21 && \
rustup default nightly-2023-08-21
2 changes: 1 addition & 1 deletion prover/proof_fri_compressor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Used to compress FRI proof to Bellman proof that gets sent to L1.

## running

`zk f cargo +nightly-2023-07-21 run --release --bin zksync_proof_fri_compressor`
`zk f cargo +nightly-2023-08-21 run --release --bin zksync_proof_fri_compressor`
8 changes: 4 additions & 4 deletions prover/prover_fri/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

## running cpu prover

`zk f cargo +nightly-2023-07-21 run --release --bin zksync_prover_fri`
`zk f cargo +nightly-2023-08-21 run --release --bin zksync_prover_fri`

## running gpu prover(requires CUDA 12.0+)

`zk f cargo +nightly-2023-07-21 run --release --features "gpu" --bin zksync_prover_fri`
`zk f cargo +nightly-2023-08-21 run --release --features "gpu" --bin zksync_prover_fri`

## Proving a block using CPU prover locally

Expand All @@ -17,7 +17,7 @@ Machine specs:
- RAM: 60GB of RAM(if you have lower RAM machine enable swap)
- Disk: 400GB of free disk

1. Install the correct nightly version using command: `rustup install nightly-2023-07-21`
1. Install the correct nightly version using command: `rustup install nightly-2023-08-21`
2. Generate the cpu setup data (no need to regenerate if it's already there). This will consume around 300Gb of disk.
Use these commands:

Expand Down Expand Up @@ -67,7 +67,7 @@ pre-requisite. This is useful for debugging and testing Machine specs:
- Disk: 30GB of free disk
- GPU: 1x Nvidia L4/T4 with 16GB of GPU RAM

1. Install the correct nightly version using command: `rustup install nightly-2023-07-21`
1. Install the correct nightly version using command: `rustup install nightly-2023-08-21`
2. Generate the gpu setup data (no need to regenerate if it's already there). This will consume around 300Gb of disk.
Use these commands:

Expand Down
8 changes: 4 additions & 4 deletions prover/vk_setup_data_generator_server_fri/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ zk init keys/setup/setup_2^26.key

## generating setup-data for specific circuit type

`zk f cargo +nightly-2023-07-21 run --release --bin zksync_setup_data_generator_fri -- --numeric-circuit 1 --is_base_layer`
`zk f cargo +nightly-2023-08-21 run --release --bin zksync_setup_data_generator_fri -- --numeric-circuit 1 --is_base_layer`

## generating GPU setup-data for specific circuit type

`zk f cargo +nightly-2023-07-21 run --features "gpu" --release --bin zksync_setup_data_generator_fri -- --numeric-circuit 1 --is_base_layer`
`zk f cargo +nightly-2023-08-21 run --features "gpu" --release --bin zksync_setup_data_generator_fri -- --numeric-circuit 1 --is_base_layer`

## Generating VK's

`cargo +nightly-2023-07-21 run --release --bin zksync_vk_generator_fri`
`cargo +nightly-2023-08-21 run --release --bin zksync_vk_generator_fri`

## generating VK commitment for existing VK's

`cargo +nightly-2023-07-21 run --release --bin zksync_commitment_generator_fri`
`cargo +nightly-2023-08-21 run --release --bin zksync_commitment_generator_fri`
2 changes: 1 addition & 1 deletion prover/witness_vector_generator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Used to generate witness vectors using circuit and sending them to prover over T

## running

`zk f cargo +nightly-2023-07-21 run --release --bin zksync_witness_vector_generator`
`zk f cargo +nightly-2023-08-21 run --release --bin zksync_witness_vector_generator`

0 comments on commit 67ef133

Please sign in to comment.