From 674fae0c968d33b29ba236509960b620a0df3bad Mon Sep 17 00:00:00 2001 From: Martin Paulucci Date: Thu, 16 Jan 2025 18:03:41 +0100 Subject: [PATCH] ci(core): post to test channel when triggering the job manually. --- .../scripts/{publish.sh => publish_hive.sh} | 4 +- ...ts_summary.sh => publish_levm_ef_tests.sh} | 2 +- .github/scripts/publish_levm_hive.sh | 4 +- .github/scripts/publish_loc.sh | 2 +- ..._revm_levm_diff.sh => publish_vms_diff.sh} | 2 +- .github/workflows/daily_loc.yaml | 35 +++++------ .github/workflows/daily_reports.yaml | 62 ++++++++++--------- 7 files changed, 55 insertions(+), 56 deletions(-) rename .github/scripts/{publish.sh => publish_hive.sh} (90%) rename .github/scripts/{publish_levm_ef_tests_summary.sh => publish_levm_ef_tests.sh} (85%) rename .github/scripts/{publish_revm_levm_diff.sh => publish_vms_diff.sh} (95%) diff --git a/.github/scripts/publish.sh b/.github/scripts/publish_hive.sh similarity index 90% rename from .github/scripts/publish.sh rename to .github/scripts/publish_hive.sh index ef140e3b06..8b66671d6f 100644 --- a/.github/scripts/publish.sh +++ b/.github/scripts/publish_hive.sh @@ -1,4 +1,4 @@ -curl -X POST $url \ +curl -X POST $1 \ -H 'Content-Type: application/json; charset=utf-8' \ --data @- <> $GITHUB_STEP_SUMMARY cat loc_report_github.txt >> $GITHUB_STEP_SUMMARY - - name: Post results to ethrex L1 slack channel + - name: Post results to Slack env: - url: ${{ secrets.ETHREX_L1_SLACK_WEBHOOK }} - run: sh .github/scripts/publish_loc.sh - - - name: Post results to ethrex L2 slack channel - env: - url: ${{ secrets.ETHREX_L2_SLACK_WEBHOOK }} - run: sh .github/scripts/publish_loc.sh - - - name: Post results to levm slack channel - env: - url: ${{ secrets.LEVM_SLACK_WEBHOOK }} - run: sh .github/scripts/publish_loc.sh - - # This is left commented out to ease debugging later on. - # Comment out all the other "Post to * slack channel" directives - # - name: Post results to test slack channel - # env: - # url: ${{ secrets.TEST_CHANNEL_SLACK }} - # run: sh .github/scripts/publish_loc.sh + SLACK_WEBHOOKS: > + ${{ github.event_name == 'workflow_dispatch' + ? secrets.TEST_CHANNEL_SLACK + : format( + '{0}, {1}, {2}', + secrets.ETHREX_REPORTS_SLACK_WEBHOOK, + secrets.ETHREX_L2_SLACK_WEBHOOK, + secrets.LEVM_SLACK_WEBHOOK + ) + }} + run: | + for webhook in $SLACK_WEBHOOKS; do + sh .github/scripts/publish_loc.sh "$webhook" + done diff --git a/.github/workflows/daily_reports.yaml b/.github/workflows/daily_reports.yaml index 94ec12ffea..b57ac04d1c 100644 --- a/.github/workflows/daily_reports.yaml +++ b/.github/workflows/daily_reports.yaml @@ -62,7 +62,7 @@ jobs: if-no-files-found: error hive-report: - name: Generate report and upload to slack (${{ matrix.vm }}) + name: Generate report and upload to Slack (${{ matrix.vm }}) needs: run-hive runs-on: ubuntu-latest strategy: @@ -102,25 +102,26 @@ jobs: echo "# Hive coverage report (${{ matrix.vm }})" >> $GITHUB_STEP_SUMMARY cat results.md >> $GITHUB_STEP_SUMMARY - - name: Post results to ethrex L1 slack channel + - name: Post results to Slack env: - url: ${{ secrets.ETHREX_L1_SLACK_WEBHOOK }} - run: sh .github/scripts/publish.sh - - - name: Post results to ethrex L2 slack channel - env: - url: ${{ secrets.ETHREX_L2_SLACK_WEBHOOK }} - run: sh .github/scripts/publish.sh - - - name: Post results to levm slack channel - env: - url: ${{ secrets.LEVM_SLACK_WEBHOOK }} + SLACK_WEBHOOKS: > + ${{ github.event_name == 'workflow_dispatch' + ? secrets.TEST_CHANNEL_SLACK + : format( + '{0}, {1}, {2}', + secrets.ETHREX_REPORTS_SLACK_WEBHOOK, + secrets.LEVM_SLACK_WEBHOOK + ) + }} + SCRIPT: > + ${{ matrix.vm == 'levm' + ? '.github/scripts/publish_levm_hive.sh' + : '.github/scripts/publish_hive.sh' + }} run: | - if [ "${{ matrix.vm }}" = "revm" ]; then - sh .github/scripts/publish.sh - elif [ "${{ matrix.vm }}" = "levm" ]; then - sh .github/scripts/publish_levm_hive.sh - fi + for webhook in $SLACK_WEBHOOKS; do + sh $SCRIPT "$webhook" + done hive-diff-report: name: Post tests diff to levm slack @@ -142,13 +143,17 @@ jobs: name: results_revm.md path: ./results_revm.md - - name: Post results diff in LEVM channel + - name: Post results diff to Slack env: - url: ${{ secrets.LEVM_SLACK_WEBHOOK }} + SLACK_WEBHOOK: > + ${{ github.event_name == 'workflow_dispatch' + ? secrets.TEST_CHANNEL_SLACK + : secrets.LEVM_SLACK_WEBHOOK + }} run: | bash .github/scripts/levm_revm_diff.sh results_revm.md results_levm.md >> diff.md cat diff.md >> $GITHUB_STEP_SUMMARY - bash .github/scripts/publish_revm_levm_diff.sh + sh .github/scripts/publish_vms_diff.sh $SLACK_WEBHOOK levm-test: name: Generate Report for LEVM EF Tests @@ -180,12 +185,11 @@ jobs: echo "# Daily LEVM EF Tests Run Report" >> $GITHUB_STEP_SUMMARY cat cmd/ef_tests/levm/levm_ef_tests_summary_github.txt >> $GITHUB_STEP_SUMMARY - # - name: Post results to ethrex L2 slack channel - # env: - # url: ${{ secrets.ETHREX_L2_SLACK_WEBHOOK }} - # run: sh .github/scripts/publish_levm_ef_tests_summary.sh - - - name: Post results to levm slack channel + - name: Post results to Slack env: - url: ${{ secrets.LEVM_SLACK_WEBHOOK }} - run: sh .github/scripts/publish_levm_ef_tests_summary.sh + SLACK_WEBHOOK: > + ${{ github.event_name == 'workflow_dispatch' + ? secrets.TEST_CHANNEL_SLACK + : secrets.LEVM_SLACK_WEBHOOK + }} + run: sh .github/scripts/publish_levm_ef_tests.sh $SLACK_WEBHOOK