From bbfeef4e56fe39f8efdc2ff371f254e590096ea8 Mon Sep 17 00:00:00 2001 From: Andrei Malashkin Date: Mon, 30 Sep 2024 13:43:24 +0200 Subject: [PATCH 1/3] repair flake --- flake.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/flake.nix b/flake.nix index f6d948e36f..7808da8c00 100644 --- a/flake.nix +++ b/flake.nix @@ -122,6 +122,9 @@ runTests = false; crypto3 = crypto3-clang-debug; evm-assigner = evm-assigner-clang-debug; + proof-producer = proof-producer-clang-debug; + transpiler = transpiler-clang-debug; + parallel-crypto3 = parallel-crypto3-clang-debug; }); transpiler = (pkgs.callPackage ./transpiler/transpiler.nix { From 750941aea2f713ad141a3a718ca3d51ffd75baae Mon Sep 17 00:00:00 2001 From: Andrei Malashkin Date: Mon, 30 Sep 2024 13:44:07 +0200 Subject: [PATCH 2/3] update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6cf62bff11..cd6a5735a7 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ *.cb *.cb2 .*.lb +*.csv ## Intermediate documents: *.dvi From 5fc1a6f42e934d7f3245229259a5234496ab0f5f Mon Sep 17 00:00:00 2001 From: Andrei Malashkin Date: Mon, 30 Sep 2024 13:45:18 +0200 Subject: [PATCH 3/3] remove .github subfolders --- crypto3/.github/workflows/build_docs.yaml | 52 ------------------- .../workflows/crypto3-testing-linux.yml | 35 ------------- .../.github/workflows/crypto3-testing-mac.yml | 26 ---------- crypto3/.github/workflows/pull-request.yml | 30 ----------- .../.github/scripts/pure-cmake-build.sh | 14 ----- evm-assigner/.github/workflows/build.yml | 36 ------------- .../.github/scripts/pure_cmake_build.sh | 14 ----- .../.github/workflows/check-formatting.yml | 41 --------------- .../.github/workflows/run-tests-linux.yml | 42 --------------- 9 files changed, 290 deletions(-) delete mode 100644 crypto3/.github/workflows/build_docs.yaml delete mode 100644 crypto3/.github/workflows/crypto3-testing-linux.yml delete mode 100644 crypto3/.github/workflows/crypto3-testing-mac.yml delete mode 100644 crypto3/.github/workflows/pull-request.yml delete mode 100755 evm-assigner/.github/scripts/pure-cmake-build.sh delete mode 100644 evm-assigner/.github/workflows/build.yml delete mode 100755 zkevm-framework/.github/scripts/pure_cmake_build.sh delete mode 100644 zkevm-framework/.github/workflows/check-formatting.yml delete mode 100644 zkevm-framework/.github/workflows/run-tests-linux.yml diff --git a/crypto3/.github/workflows/build_docs.yaml b/crypto3/.github/workflows/build_docs.yaml deleted file mode 100644 index a65ef7de85..0000000000 --- a/crypto3/.github/workflows/build_docs.yaml +++ /dev/null @@ -1,52 +0,0 @@ -name: Build docs - -on: - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - # Triggers workflow on every push to master branch - push: - branches: - - "master" - -jobs: - build: - runs-on: [self-hosted, documentation-builder] - - env: - DOXYFILE_NAME: "crypto3.doxyfile" - DDOXYGEN_OUTPUT_DIR: "doxygen_build" - BUILD_NAME: build_docs-${{ github.sha }} - BUILD_ARCHIVE_NAME: build_docs-${{ github.sha }}.tar.gz - - steps: - - name: Cleanup # TODO - move to scripts on runner - run: | - rm -rf ./* || true - rm -rf ./.??* || true - - - name: Checkout - uses: actions/checkout@v3 - with: - submodules: recursive - - - name: Cmake and build - env: - CMAKE_ARGS: "-DBUILD_SHARED_LIBS=TRUE -DBUILD_TESTS=TRUE -DDOXYGEN_OUTPUT_DIR=${{ env.DDOXYGEN_OUTPUT_DIR }}" - run: | - mkdir build - cd build - cmake ${{env.CMAKE_ARGS}} .. - - - name: Build doxygen - working-directory: ./build - run: doxygen ${{ env.DOXYFILE_NAME }} - - - name: Archive build results - working-directory: ./build - run: tar -czf ${{ env.BUILD_ARCHIVE_NAME }} -C ${{ env.DDOXYGEN_OUTPUT_DIR }} . - - - name: Upload build results - uses: actions/upload-artifact@v3 - with: - name: ${{ env.BUILD_NAME }} - path: ./build/${{ env.BUILD_ARCHIVE_NAME }} diff --git a/crypto3/.github/workflows/crypto3-testing-linux.yml b/crypto3/.github/workflows/crypto3-testing-linux.yml deleted file mode 100644 index 6399a4f223..0000000000 --- a/crypto3/.github/workflows/crypto3-testing-linux.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Crypto3 Build and Test on Linux Platforms - -on: - workflow_call: - -jobs: - build-and-test: - name: "Build and test Linux" - runs-on: [self-hosted, Linux, X64, aws_autoscaling] - steps: - # https://github.com/actions/checkout/issues/1552 - - name: Clean up after previous checkout - run: chmod +w -R ${GITHUB_WORKSPACE}; rm -rf ${GITHUB_WORKSPACE}/*; - - - name: Checkout Crypto3 - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Checkout submodules to specified refs - if: inputs.submodules-refs != '' - uses: NilFoundation/ci-cd/actions/recursive-checkout@v1.2.1 - with: - refs: ${{ inputs.submodules-refs }} - paths: | - ${{ github.workspace }}/** - !${{ github.workspace }}/ - !${{ github.workspace }}/**/.git/** - - - name: Run checks - run: nix flake -L check - env: - NIX_CONFIG: | - cores = 6 - max-jobs = 4 diff --git a/crypto3/.github/workflows/crypto3-testing-mac.yml b/crypto3/.github/workflows/crypto3-testing-mac.yml deleted file mode 100644 index 99fb449563..0000000000 --- a/crypto3/.github/workflows/crypto3-testing-mac.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Crypto3 Build and Test on macOS Platforms - -on: - workflow_call: - -jobs: - build-and-test: - name: "Build and test macOS" - runs-on: [macos-14] - steps: - - name: Checkout Crypto3 - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - # From https://github.com/DeterminateSystems/magic-nix-cache-action - - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main - - uses: DeterminateSystems/flake-checker-action@main - - - name: Run checks - run: nix flake -L check - env: - NIX_CONFIG: | - cores = 0 - max-jobs = 1 diff --git a/crypto3/.github/workflows/pull-request.yml b/crypto3/.github/workflows/pull-request.yml deleted file mode 100644 index 985165718b..0000000000 --- a/crypto3/.github/workflows/pull-request.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: PR Testing - -on: - pull_request: - 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: - test-linux: - name: Linux Crypto3 Testing - uses: ./.github/workflows/crypto3-testing-linux.yml - if: | - always() && !cancelled() - secrets: inherit - - test-mac: - name: macOS Crypto3 Testing - uses: ./.github/workflows/crypto3-testing-mac.yml - if: | - always() && !cancelled() - secrets: inherit diff --git a/evm-assigner/.github/scripts/pure-cmake-build.sh b/evm-assigner/.github/scripts/pure-cmake-build.sh deleted file mode 100755 index 79f98e598c..0000000000 --- a/evm-assigner/.github/scripts/pure-cmake-build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -e - -nix develop -c "env" | grep CMAKE_PREFIX_PATH >cmake_prefix -echo "export `cat cmake_prefix`" > cmake_prefix -source cmake_prefix -cat cmake_prefix -rm cmake_prefix -CMAKE_BINARY=$(nix develop -c bash -c 'which cmake' | tail -1) -NINJA_BINARY=$(nix develop -c bash -c 'which ninja' | tail -1) -CC=$(nix develop -c bash -c 'which gcc' | tail -1) -CXX=$(nix develop -c bash -c 'which g++' | tail -1) -set -x -$CMAKE_BINARY -GNinja -DCMAKE_MAKE_PROGRAM=$NINJA_BINARY -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX -DBUILD_ASSIGNER_TESTS=TRUE -$NINJA_BINARY -C build diff --git a/evm-assigner/.github/workflows/build.yml b/evm-assigner/.github/workflows/build.yml deleted file mode 100644 index c5b94bfaea..0000000000 --- a/evm-assigner/.github/workflows/build.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Build and test on Linux - -on: - push: - branches: [ master ] - pull_request: - -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: - build-and-test: - name: Build and run tests - - runs-on: [self-hosted, Linux, X64, aws_autoscaling] - - steps: - # https://github.com/actions/checkout/issues/1552 - - name: Clean up after previous checkout - run: chmod +w -R ${GITHUB_WORKSPACE}; rm -rf ${GITHUB_WORKSPACE}/*; - - - name: Checkout sources - uses: actions/checkout@v3 - - - name: Build sources - run: nix build -L - - - name: Run tests - run: nix flake -L check - diff --git a/zkevm-framework/.github/scripts/pure_cmake_build.sh b/zkevm-framework/.github/scripts/pure_cmake_build.sh deleted file mode 100755 index 38b7b58157..0000000000 --- a/zkevm-framework/.github/scripts/pure_cmake_build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -e - -nix develop -c "env" | grep CMAKE_PREFIX_PATH >cmake_prefix -echo "export `cat cmake_prefix`" > cmake_prefix -source cmake_prefix -cat cmake_prefix -rm cmake_prefix -CMAKE_BINARY=$(nix develop -c bash -c 'which cmake' | tail -1) -NINJA_BINARY=$(nix develop -c bash -c 'which ninja' | tail -1) -CC=$(nix develop -c bash -c 'which gcc' | tail -1) -CXX=$(nix develop -c bash -c 'which g++' | tail -1) -set -x -$CMAKE_BINARY -GNinja -DCMAKE_MAKE_PROGRAM=$NINJA_BINARY -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX -DENABLE_TESTS=TRUE -$NINJA_BINARY -C build diff --git a/zkevm-framework/.github/workflows/check-formatting.yml b/zkevm-framework/.github/workflows/check-formatting.yml deleted file mode 100644 index 17bd5930c7..0000000000 --- a/zkevm-framework/.github/workflows/check-formatting.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Check formatting - -on: - push: - branches: [ master ] - pull_request: - -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: - code-formatting-check: - name: Code formatting check - runs-on: [ self-hosted, Linux, X64, aws_autoscaling ] - steps: - - name: Checkout sources - uses: actions/checkout@v3 - - - name: Run clang-format - uses: jidicula/clang-format-action@v4.11.0 - with: - clang-format-version: "17" - - markdown-formatting-check: - name: Markdown formatting check - runs-on: [ self-hosted, Linux, X64, aws_autoscaling ] - steps: - - name: Checkout sources - uses: actions/checkout@v3 - - - name: Run markdownlint - uses: DavidAnson/markdownlint-cli2-action@v16 - with: - config: .markdownlint.yml - globs: '**/*.md' diff --git a/zkevm-framework/.github/workflows/run-tests-linux.yml b/zkevm-framework/.github/workflows/run-tests-linux.yml deleted file mode 100644 index b769e7fa30..0000000000 --- a/zkevm-framework/.github/workflows/run-tests-linux.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: Run tests on Linux - -on: - push: - branches: [ master ] - paths-ignore: - - '**.md' - pull_request: - paths-ignore: - - '**.md' - -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: - build-and-test: - name: Run tests workflow on Release build - runs-on: [ self-hosted, Linux, X64, aws_autoscaling ] - steps: - # https://github.com/actions/checkout/issues/1552 - - name: Clean up after previous checkout - run: chmod +w -R ${GITHUB_WORKSPACE}; rm -rf ${GITHUB_WORKSPACE}/*; - - - name: Checkout zkEVM-framework - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: Run build - run: nix build -L - - - name: Run checks - run: nix flake -L check - - - name: Check build without nix environment - run: .github/scripts/pure_cmake_build.sh