diff --git a/.github/workflows/provision-replay-verify-archive-disks.yaml b/.github/workflows/provision-replay-verify-archive-disks.yaml index a8fd80ef2df5b..067c3dafbbc27 100644 --- 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 index 0a5ba5ea90688..3effdbc23f0e0 100644 --- 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 index e0560371a98b6..5cccf74624724 100644 --- 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 index ec2aab5147c51..8fb3954ebe45a 100644 --- 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 index e8b29e363b4ee..b8133bd73f375 100644 --- 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()