From 60a70c46fe35a661351931e7adbdecd12c74bf05 Mon Sep 17 00:00:00 2001 From: Andrei Malashkin Date: Mon, 25 Nov 2024 18:56:32 +0100 Subject: [PATCH] remove testing of nightly from regular build; restore normal pull request workflow --- .github/workflows/nightly.yml | 20 ++++++++--- .github/workflows/pull-request.yml | 58 +++++++++++------------------- 2 files changed, 37 insertions(+), 41 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 9b4b9ec821..949c7e6db9 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -18,16 +18,28 @@ jobs: needs: - test-linux-sanitizers steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Post logs to Sig Noz run: | ls -l -a - ls -l -a ./result/ - pip3 install -r requirements.txt + nix build -L .?#checks.x86_64-linux.all-sanitizers + cat ./result/test-logs/test_errors.txt + export UndefinedBehaviorSanitizer=$(grep UndefinedBehaviorSanitizer result/test-logs/test_errors.txt | wc -l) + export AddressSanitizer=$(grep AddressSanitizer result/test-logs/test_errors.txt | wc -l) + export LeakSanitizer=$(grep LeakSanitizer result/test-logs/test_errors.txt | wc -l) export OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED=true - ping 172.31.23.196 - opentelemetry-instrument \ + python3 --version + sudo yum update -y + sudo yum install -y python3-pip + pip3 install -r requirements.txt + /home/ec2-user/.local/bin/opentelemetry-instrument \ --traces_exporter console,otlp \ --metrics_exporter console,otlp \ --logs_exporter console,otlp \ --service_name nightly-build \ python3 ./parse_tests.py + diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 8a8250c0c7..91ac921fab 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -16,46 +16,30 @@ concurrency: cancel-in-progress: true jobs: - test-linux-sanitizers: - name: Linux Crypto3 Test and sanitize with clang - uses: ./.github/workflows/clang-sanitizers-linux-nix-check.yml + test-linux-gcc: + name: Linux placeholder testing with gcc + uses: ./.github/workflows/gcc-linux-nix-check.yml if: | always() && !cancelled() secrets: inherit - post-telemetry: - name: Post test results in Open Telemetry format - runs-on: [self-hosted, Linux, X64, aws_autoscaling] - needs: - - test-linux-sanitizers - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 + test-linux-clang: + name: Linux placeholder testing with clang + uses: ./.github/workflows/clang-linux-nix-check.yml + if: | + always() && !cancelled() + secrets: inherit - - name: Post logs to Sig Noz - run: | - ls -l -a - nix build -L .?#checks.x86_64-linux.all-sanitizers - ls -l -a result/test-logs - cat ./result/test-logs/test_errors.txt - export UndefinedBehaviorSanitizer=$(grep UndefinedBehaviorSanitizer result/test-logs/test_errors.txt | wc -l) - export AddressSanitizer=$(grep AddressSanitizer result/test-logs/test_errors.txt | wc -l) - export LeakSanitizer=$(grep LeakSanitizer result/test-logs/test_errors.txt | wc -l) - ls -l -a - ls -l -a ./result/ - export OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED=true - python3 --version - sudo yum update -y - sudo yum install -y python3-pip - pip3 install -r requirements.txt - python3 ./parse_tests.py - ls /home/ec2-user/.local/bin/ - /home/ec2-user/.local/bin/opentelemetry-instrument \ - --traces_exporter console,otlp \ - --metrics_exporter console,otlp \ - --logs_exporter console,otlp \ - --service_name nightly-build \ - python3 ./parse_tests.py + check-proof-producer: + name: Check Proof Producer + uses: ./.github/workflows/check-proof-producer.yml + if: | + always() && !cancelled() + secrets: inherit + verify-circuit-proof: + name: Verify Circuit Proof + uses: ./.github/workflows/verify-circuit-proof.yml + if: | + always() && !cancelled() + secrets: inherit