From c0478824b5ad9c3704f48bda7420f756ee69e5fa Mon Sep 17 00:00:00 2001 From: x-mass <36629999+x-mass@users.noreply.github.com> Date: Sat, 20 Apr 2024 13:41:07 +0000 Subject: [PATCH] Disable actor checks --- .github/workflows/pull_request.yml | 2 +- .github/workflows/reusable-generate-proofs-linux.yml | 4 +++- bin/proof-generator/CMakeLists.txt | 4 ++-- bin/proof-generator/include/nil/proof-generator/prover.hpp | 2 +- libs/actor/container | 2 +- libs/actor/zk | 2 +- libs/crypto3 | 2 +- libs/transpiler | 2 +- 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 92918449..179dff07 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -262,7 +262,7 @@ jobs: working-directory: ${{ steps.strings.outputs.artifact-dir }} run: | extra_args="" - if [[ "true" == "true" ]]; then + if [[ "true" == "false" ]]; then extra_args="--multithreaded " fi targets_str=$(echo "${{ needs.prepare-targets.outputs.prover-targets }}" | awk '{$1=$1};1' | sed '/^$/d' | tr '\n' ' ' | sed 's/ $//') diff --git a/.github/workflows/reusable-generate-proofs-linux.yml b/.github/workflows/reusable-generate-proofs-linux.yml index afa4faac..5423ecbb 100644 --- a/.github/workflows/reusable-generate-proofs-linux.yml +++ b/.github/workflows/reusable-generate-proofs-linux.yml @@ -33,7 +33,7 @@ on: type: string description: "Version of Boost to install" required: false - default: '1.83.0' + default: '1.78.0' outputs: artifact-name: @@ -186,3 +186,5 @@ jobs: name: ${{ steps.set-artifact-name.outputs.artifact-name }} path: | ${{ steps.strings.outputs.artifact-dir }} + + diff --git a/bin/proof-generator/CMakeLists.txt b/bin/proof-generator/CMakeLists.txt index 912bd4bc..c8309e65 100644 --- a/bin/proof-generator/CMakeLists.txt +++ b/bin/proof-generator/CMakeLists.txt @@ -114,7 +114,7 @@ set(SINGLE_THREADED_TARGET "${CURRENT_PROJECT_NAME}-single-threaded") setup_proof_generator_target(TARGET_NAME ${SINGLE_THREADED_TARGET} ADDITIONAL_DEPENDENCIES crypto3::zk) # Declare multi-threaded target -set(MUTLI_THREADED_TARGET "${CURRENT_PROJECT_NAME}-multi-threaded") -setup_proof_generator_target(TARGET_NAME ${MUTLI_THREADED_TARGET} ADDITIONAL_DEPENDENCIES actor::zk) +# set(MUTLI_THREADED_TARGET "${CURRENT_PROJECT_NAME}-multi-threaded") +# setup_proof_generator_target(TARGET_NAME ${MUTLI_THREADED_TARGET} ADDITIONAL_DEPENDENCIES actor::zk) install(TARGETS ${SINGLE_THREADED_TARGET} ${MUTLI_THREADED_TARGET} RUNTIME DESTINATION bin) diff --git a/bin/proof-generator/include/nil/proof-generator/prover.hpp b/bin/proof-generator/include/nil/proof-generator/prover.hpp index c1c1b392..c4bdd33b 100644 --- a/bin/proof-generator/include/nil/proof-generator/prover.hpp +++ b/bin/proof-generator/include/nil/proof-generator/prover.hpp @@ -39,12 +39,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include diff --git a/libs/actor/container b/libs/actor/container index 97b9ee5c..2cb15c95 160000 --- a/libs/actor/container +++ b/libs/actor/container @@ -1 +1 @@ -Subproject commit 97b9ee5cfca2930db33dd616fcdf46ff51c48a0d +Subproject commit 2cb15c9585207b57ef86121c89fdf37539e2f8fd diff --git a/libs/actor/zk b/libs/actor/zk index 24a4481f..e66ca9ca 160000 --- a/libs/actor/zk +++ b/libs/actor/zk @@ -1 +1 @@ -Subproject commit 24a4481ffb6a411483cacdcede71efde0a121cce +Subproject commit e66ca9ca827dcd71bce664184632ff6391cdd0ca diff --git a/libs/crypto3 b/libs/crypto3 index 7f3f8e98..1baa6194 160000 --- a/libs/crypto3 +++ b/libs/crypto3 @@ -1 +1 @@ -Subproject commit 7f3f8e9857b1dbb1f00cf567bbbb38795a8d586e +Subproject commit 1baa619449013b5fb2962b7edc59a14dbe2f59f2 diff --git a/libs/transpiler b/libs/transpiler index 76f254f4..1e6489d2 160000 --- a/libs/transpiler +++ b/libs/transpiler @@ -1 +1 @@ -Subproject commit 76f254f4a5573316cddcf41b53affbd672f33b3b +Subproject commit 1e6489d2b056e468a5cbcfdd8155ac7179e1dd9c