remove the branch ref to default to main

aptos-labs · Dec 3, 2024 · b011781 · b011781
1 parent 997f8b9
commit b011781
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/provision-replay-verify-archive-disks.yaml b/.github/workflows/provision-replay-verify-archive-disks.yaml
@@ -46,7 +46,6 @@ jobs:
   provision-testnet:
     if: |
       github.event_name == 'schedule' ||
-      github.event_name == 'push' ||
       github.event_name == 'workflow_dispatch' && (inputs.NETWORK == 'testnet' || inputs.NETWORK == 'all')
     needs: determine-test-metadata
     uses: ./.github/workflows/workflow-run-replay-verify-archive-storage-provision.yaml

diff --git a/.github/workflows/replay-verify-on-archive.yaml b/.github/workflows/replay-verify-on-archive.yaml
@@ -58,7 +58,6 @@ jobs:
   replay-testnet:
     if: |
       github.event_name == 'schedule' ||
-      github.event_name == 'push' ||
       github.event_name == 'workflow_dispatch' && (inputs.NETWORK == 'testnet' || inputs.NETWORK == 'all')
     needs: determine-test-metadata
     uses: ./.github/workflows/workflow-run-replay-verify-on-archive.yaml
@@ -72,8 +71,6 @@ jobs:
   replay-mainnet:
     if: |
       github.event_name == 'schedule' ||
-      github.event_name == 'push' ||
-      github.event_name == 'pull_request' ||
       github.event_name == 'workflow_dispatch' && (inputs.NETWORK == 'mainnet' || inputs.NETWORK == 'all' )
     needs: determine-test-metadata
     uses: ./.github/workflows/workflow-run-replay-verify-on-archive.yaml

diff --git a/.github/workflows/workflow-run-replay-verify-archive-storage-provision.yaml b/.github/workflows/workflow-run-replay-verify-archive-storage-provision.yaml
@@ -21,7 +21,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.inputs.BRANCH || 'add_replay_verify_workflow' }}      
+          ref: ${{ github.event.pull_request.head.ref || github.ref }}
 
       # Authenticate to Google Cloud the project is aptos-ci
       - name: Authenticate to Google Cloud

diff --git a/.github/workflows/workflow-run-replay-verify-on-archive.yaml b/.github/workflows/workflow-run-replay-verify-on-archive.yaml
@@ -46,7 +46,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.inputs.BRANCH || 'add_replay_verify_workflow' }}
+          ref: ${{ github.event.pull_request.head.ref || github.ref }}
 
       - uses: aptos-labs/aptos-core/.github/actions/docker-setup@main
         id: docker-setup
@@ -113,6 +113,7 @@ jobs:
         run: |
           cd testsuite/replay-verify
           poetry run python main.py  --network ${{ inputs.NETWORK }} --cleanup
+          echo "Cleanup completed"
 
           
           

diff --git a/testsuite/replay-verify/main.py b/testsuite/replay-verify/main.py
@@ -561,6 +561,9 @@ def print_logs(failed_workpod_logs, txn_mismatch_logs):
             (failed_logs, txn_mismatch_logs) = scheduler.collect_all_failed_logs()
             scheduler.print_stats()
             print_logs(failed_logs, txn_mismatch_logs)
+            if txn_mismatch_logs:  
+                logger.error("Transaction mismatch logs found.")  
+                exit(1)  
 
         finally:
             scheduler.cleanup()