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.

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

Use reusable workflow in testing action #244

Merged
merged 2 commits into from
Dec 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 13 additions & 0 deletions .github/workflows/publish-results.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Needed to publish test results in fork
name: Testing Callback

on:
workflow_run:
workflows: ["PR Testing"]
types:
- completed

jobs:
call-reusable-workflow:
name: Call Reusable Testing Callback Workflow
uses: NilFoundation/ci-cd/.github/workflows/reusable-crypto3-publish-result.yml@v1
38 changes: 38 additions & 0 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: PR Testing

on:
pull_request:
types:
- opened
- synchronize

jobs:
handle-syncwith:
name: Call Reusable SyncWith Handler
uses: NilFoundation/ci-cd/.github/workflows/reusable-handle-syncwith.yml@v1
with:
ci-cd-ref: 'v1'
secrets: inherit

matrix-test:
name: Call Reusable Crypto3 Testing
needs:
- handle-syncwith
uses: NilFoundation/ci-cd/.github/workflows/[email protected]
secrets: inherit
with:
submodules-refs: ${{ needs.handle-syncwith.outputs.prs-refs }}
concurrency: 2 # adjust if fails with OOM
targets: |
crypto3_zk_commitment_fold_polynomial_test
crypto3_zk_commitment_fri_test
crypto3_zk_commitment_lpc_test
crypto3_zk_commitment_kzg_test
crypto3_zk_systems_plonk_placeholder_placeholder_test
crypto3_zk_commitment_powers_of_tau_test
crypto3_zk_commitment_proof_of_knowledge_test
crypto3_zk_commitment_r1cs_gg_ppzksnark_mpc_test
crypto3_zk_math_expression_test
crypto3_zk_systems_plonk_plonk_constraint_test
crypto3_zk_commitment_proof_of_knowledge_test
crypto3_zk_transcript_transcript_test
145 changes: 0 additions & 145 deletions .github/workflows/run_tests.yml

This file was deleted.

38 changes: 25 additions & 13 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,19 @@ if(ZK_PLACEHOLDER_PROFILING)
endif()

macro(define_zk_test test)
get_filename_component(name ${test} NAME)
string(REPLACE "/" "_" full_test_name ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}_${test}_test)
cm_test(NAME ${full_test_name} SOURCES ${test}.cpp)

set(additional_args "")
if(ENABLE_JUNIT_TEST_OUTPUT)
set(TEST_RESULTS_DIR "${CMAKE_CURRENT_BINARY_DIR}/junit_results")
set(TEST_LOGS_DIR "${TEST_RESULTS_DIR}/logs")
file(MAKE_DIRECTORY ${TEST_LOGS_DIR})

set(additional_args "--log_format=JUNIT"
"--log_sink=${TEST_LOGS_DIR}/${full_test_name}.xml")
endif()

cm_test(NAME ${full_test_name} SOURCES ${test}.cpp ARGS ${additional_args})

target_include_directories(${full_test_name} PRIVATE
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
Expand All @@ -59,16 +69,18 @@ macro(define_zk_test test)
endmacro()

set(TESTS_NAMES
# FIXME: these targets are disabled because they fail compilation. Either fix them or remove (if not needed)
# "commitment/lpc_performance" TODO try to enable
# "commitment/pedersen"
# "commitment/type_traits"

"commitment/lpc"
"commitment/fri"
"commitment/kzg"
"commitment/fold_polynomial"
"commitment/lpc_performance"
"commitment/pedersen"
"commitment/proof_of_knowledge"
"commitment/powers_of_tau"
"commitment/r1cs_gg_ppzksnark_mpc"
"commitment/type_traits"
"commitment/kimchi_pedersen"

"math/expression"
Expand All @@ -79,28 +91,28 @@ set(TESTS_NAMES
# "relations/numeric/sap"
# "relations/numeric/ssp"

"systems/plonk/pickles/pickles"
# "systems/plonk/pickles/pickles"
"systems/plonk/pickles/kimchi"
"systems/plonk/pickles/oracles"
# "systems/plonk/pickles/oracles"
"systems/plonk/pickles/to_field"
"systems/plonk/pickles/to_group"

"systems/plonk/placeholder/placeholder"
"systems/plonk/placeholder/performance"

# "systems/pcd/r1cs_pcd/r1cs_mp_ppzkpcd/r1cs_mp_ppzkpcd"
# "systems/pcd/r1cs_pcd/r1cs_sp_ppzkpcd/r1cs_sp_ppzkpcd"

# "systems/ppzksnark/bacs_ppzksnark/bacs_ppzksnark"
"systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark"
"systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_marshalling"
"systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_tvm_marshalling"
"systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark"
# "systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark"
# "systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_marshalling"
# "systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_tvm_marshalling"
# "systems/ppzksnark/r1cs_ppzksnark/r1cs_ppzksnark"
# "systems/ppzksnark/r1cs_se_ppzksnark/r1cs_se_ppzksnark"
# "systems/ppzksnark/ram_ppzksnark/ram_ppzksnark"
# "systems/ppzksnark/tbcs_ppzksnark/tbcs_ppzksnark"
# "systems/ppzksnark/uscs_ppzksnark/uscs_ppzksnark"
"systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_aggregation_conformity"
# "systems/ppzksnark/r1cs_gg_ppzksnark/r1cs_gg_ppzksnark_aggregation_conformity"

"transcript/transcript"
"transcript/kimchi_transcript"
Expand Down
4 changes: 1 addition & 3 deletions test/systems/plonk/placeholder/performance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ class placeholder_performance_test : public placeholder_performance_test_base {
columns_rotations_type columns_rotations;
};

BOOST_AUTO_TEST_SUITE(placeholder_transpiler_suite, *boost::unit_test::disabled())
BOOST_AUTO_TEST_SUITE(placeholder_transpiler_suite)

BOOST_FIXTURE_TEST_CASE(placeholder_merkle_tree_poseidon_test, placeholder_performance_test<2>) {

Expand Down Expand Up @@ -434,5 +434,3 @@ BOOST_FIXTURE_TEST_CASE(placeholder_large_fibonacci_test, placeholder_performanc
}

BOOST_AUTO_TEST_SUITE_END()