mirror of
https://github.com/eth-act/ere.git
synced 2026-02-19 11:54:42 -05:00
ci: show log when test_ere_dockerized and set test threads to 1 when test via docker for sp1
This commit is contained in:
1
.github/workflows/test-zkvm-sp1.yml
vendored
1
.github/workflows/test-zkvm-sp1.yml
vendored
@@ -17,3 +17,4 @@ jobs:
|
||||
with:
|
||||
zkvm: sp1
|
||||
cuda: true
|
||||
test_threads: 1
|
||||
|
||||
31
.github/workflows/test-zkvm.yml
vendored
31
.github/workflows/test-zkvm.yml
vendored
@@ -22,6 +22,10 @@ on:
|
||||
required: false
|
||||
type: boolean
|
||||
default: false
|
||||
test_threads:
|
||||
description: 'Number of threads when testing via docker'
|
||||
required: false
|
||||
type: number
|
||||
# Remove when we use larger runners, currently only needed to skip for zisk
|
||||
skip_prove_test:
|
||||
description: 'Whether to skip prove test and ere-dockerized test or not'
|
||||
@@ -213,6 +217,18 @@ jobs:
|
||||
--tag ${{ needs.image_meta.outputs.image_tag }} \
|
||||
--cached-tag "${{ needs.image_meta.outputs.cached_image_tag }}"
|
||||
|
||||
- name: Increase swap to 10GB
|
||||
run: |
|
||||
free -h && swapon --show
|
||||
|
||||
sudo swapoff -a
|
||||
sudo fallocate -l 10G /swapfile
|
||||
sudo chmod 600 /swapfile
|
||||
sudo mkswap /swapfile
|
||||
sudo swapon /swapfile
|
||||
|
||||
free -h && swapon --show
|
||||
|
||||
- name: Run cargo test for ere-${{ inputs.zkvm }} via Docker
|
||||
run: |
|
||||
DOCKER_CMD="docker run \
|
||||
@@ -229,7 +245,7 @@ jobs:
|
||||
set -e -o pipefail
|
||||
|
||||
cargo test --release --package ere-${{ inputs.zkvm }} \
|
||||
-- ${{ inputs.skip_prove_test && '--skip prove' || '' }}
|
||||
-- ${{ inputs.skip_prove_test && '--skip prove' || '' }} ${{ inputs.test_threads && format('--test-threads={0}', inputs.test_threads) || '' }}
|
||||
|
||||
time chown -R $(id -u):$(id -g) /usr/local/cargo/registry
|
||||
time chown -R $(id -u):$(id -g) /usr/local/cargo/git
|
||||
@@ -282,8 +298,21 @@ jobs:
|
||||
--compiler \
|
||||
--server
|
||||
|
||||
- name: Increase swap to 10GB
|
||||
run: |
|
||||
free -h && swapon --show
|
||||
|
||||
sudo swapoff -a
|
||||
sudo fallocate -l 10G /swapfile
|
||||
sudo chmod 600 /swapfile
|
||||
sudo mkswap /swapfile
|
||||
sudo swapon /swapfile
|
||||
|
||||
free -h && swapon --show
|
||||
|
||||
- name: Run cargo test for ere-${{ inputs.zkvm }} via ere-dockerized
|
||||
env:
|
||||
RUST_LOG: info
|
||||
ERE_IMAGE_REGISTRY: ${{ needs.image_meta.outputs.image_registry }}
|
||||
run: |
|
||||
cargo test --release --package ere-dockerized \
|
||||
|
||||
1
Cargo.lock
generated
1
Cargo.lock
generated
@@ -4039,6 +4039,7 @@ dependencies = [
|
||||
"thiserror 2.0.12",
|
||||
"tokio",
|
||||
"tracing",
|
||||
"tracing-subscriber 0.3.20",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
||||
@@ -20,6 +20,7 @@ ere-server.workspace = true
|
||||
|
||||
[dev-dependencies]
|
||||
paste.workspace = true
|
||||
tracing-subscriber = { workspace = true, features = ["env-filter"] }
|
||||
|
||||
# Local dependencies
|
||||
ere-test-utils = { workspace = true, features = ["host"] }
|
||||
|
||||
@@ -179,12 +179,17 @@ pub(crate) mod test {
|
||||
};
|
||||
use ere_test_utils::host::testing_guest_directory;
|
||||
use ere_zkvm_interface::compiler::Compiler;
|
||||
use tracing_subscriber::EnvFilter;
|
||||
|
||||
pub fn compile(
|
||||
zkvm_kind: zkVMKind,
|
||||
compiler_kind: CompilerKind,
|
||||
program: &'static str,
|
||||
) -> SerializedProgram {
|
||||
let _ = tracing_subscriber::fmt()
|
||||
.with_env_filter(EnvFilter::from_default_env())
|
||||
.try_init();
|
||||
|
||||
DockerizedCompiler::new(zkvm_kind, compiler_kind, workspace_dir().unwrap())
|
||||
.unwrap()
|
||||
.compile(&testing_guest_directory(zkvm_kind.as_str(), program))
|
||||
|
||||
Reference in New Issue
Block a user