Skip to content

Commit

Permalink
use nix-based CI and cm_add_test_subdirectory
Browse files Browse the repository at this point in the history
  • Loading branch information
MALASHKIN Andrei committed May 17, 2024
1 parent 6431244 commit 458e9aa
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 80 deletions.
13 changes: 0 additions & 13 deletions .github/workflows/publish-results.yml

This file was deleted.

43 changes: 0 additions & 43 deletions .github/workflows/pull-request-action.yml

This file was deleted.

58 changes: 39 additions & 19 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,47 @@ name: PR Testing

on:
pull_request:
types:
- opened
- synchronize
push:
branches:
- master

concurrency:
# In master we want to run for every commit, in other branches — only for the last one
group: ${{
( github.ref == 'refs/heads/master' && format('{0}/{1}/{2}', github.workflow, github.ref, github.sha) )
||
format('{0}/{1}', github.workflow, github.ref) }}
cancel-in-progress: true

jobs:
run-pull-request-actions:
name: Reusable Crypto3 Testing
uses: ./.github/workflows/pull-request-action.yml
handle-syncwith:
name: Call Reusable SyncWith Handler
uses: NilFoundation/ci-cd/.github/workflows/[email protected]
with:
ci-cd-ref: 'v1.2.1'
secrets: inherit

test-linux:
name: Linux Reusable Crypto3 Testing
needs:
- handle-syncwith
uses: NilFoundation/crypto3/.github/workflows/reusable-submodule-testing-linux.yml@6d74f39255dd6d13542e97fbf2547565419bdc47

secrets: inherit
with:
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_math_expression_test
crypto3_zk_systems_plonk_plonk_constraint_test
crypto3_zk_commitment_proof_of_knowledge_test
crypto3_zk_transcript_transcript_test
crypto3_zk_commitment_proof_of_work_test
submodules-refs: ${{ needs.handle-syncwith.outputs.prs-refs }}
check-names: |
zk-clang
# test-mac:
# name: Mac Reusable Crypto3 Testing
# needs:
# - handle-syncwith
# uses: NilFoundation/crypto3/.github/workflows/reusable-submodule-testing-mac.yml@6d74f39255dd6d13542e97fbf2547565419bdc47

# secrets: inherit
# with:
# submodules-refs: ${{ needs.handle-syncwith.outputs.prs-refs }}
# check-names: |
# zk-clang

7 changes: 2 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ cm_find_package(CM)
include(CMDeploy)
include(FindPkgConfig)

option(BUILD_TESTS "Build unit tests" FALSE)

cm_setup_version(VERSION 0.1.0 PREFIX ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME})

add_library(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE)
Expand Down Expand Up @@ -81,6 +79,5 @@ cm_deploy(TARGETS ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}
NAMESPACE ${CMAKE_WORKSPACE_NAME}::)


if(BUILD_TESTS)
add_subdirectory(test)
endif()
include(CMTest)
cm_add_test_subdirectory(test)

0 comments on commit 458e9aa

Please sign in to comment.