@@ -38,21 +38,10 @@ jobs:
3838 - name : Check release trigger conditions
3939 id : check
4040 run : |
41- # Always run for manual dispatch
42- if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
41+ # Always run for manual dispatch or release branch pushes
42+ if [[ "${{ github.event_name }}" == "workflow_dispatch" || ("${{ github.event_name }}" == "push" && "${{ github.ref_name }}" =~ ^release/) ]]; then
4343 echo "should-run=true" >> "$GITHUB_OUTPUT"
44- echo "Performance tests triggered by manual dispatch"
45- # For push events, only run if the triggering commit is a metamaskbot version bump
46- elif [[ "${{ github.event_name }}" == "push" ]]; then
47- COMMIT_MESSAGE=$(git log -1 --format="%s" "${{ github.sha }}")
48- COMMIT_AUTHOR=$(git log -1 --format="%ae" "${{ github.sha }}")
49- if [[ "$COMMIT_MESSAGE" =~ "Bump version number" && "$COMMIT_AUTHOR" =~ ^metamaskbot@ ]]; then
50- echo "should-run=true" >> "$GITHUB_OUTPUT"
51- echo "Push triggered by metamaskbot version bump: $COMMIT_MESSAGE"
52- else
53- echo "should-run=false" >> "$GITHUB_OUTPUT"
54- echo "Push is not a metamaskbot version bump — skipping. Author: $COMMIT_AUTHOR | Message: $COMMIT_MESSAGE"
55- fi
44+ echo "Performance tests triggered by ${{ github.event_name }}"
5645 # For scheduled runs, check for recent metamaskbot version bumps
5746 elif [[ "${{ github.event_name }}" == "schedule" ]]; then
5847 git fetch --all
@@ -67,11 +56,13 @@ jobs:
6756 # Check if the commit message contains "Bump version number" (ignore [skip ci])
6857 COMMIT_MESSAGE=$(git log -1 --format="%s" "$COMMIT_HASH")
6958 if [[ "$COMMIT_MESSAGE" =~ "Bump version number" ]]; then
70- # Only run if the commit is from the last 30 minutes (to avoid re-running the same commit)
59+ # Check if we've already processed this commit by looking for a workflow run with this commit
60+ # We'll use a simple approach: check if the commit is from the last 30 minutes
7161 COMMIT_TIME=$(git log -1 --format="%ct" "$COMMIT_HASH")
7262 CURRENT_TIME=$(date +%s)
7363 TIME_DIFF=$((CURRENT_TIME - COMMIT_TIME))
7464
65+ # Only run if the commit is from the last 30 minutes (to avoid re-running the same commit)
7566 if [[ $TIME_DIFF -lt 1800 ]]; then
7667 echo "should-run=true" >> "$GITHUB_OUTPUT"
7768 echo "Recent metamaskbot version bump found (within last 30 min): $RECENT_VERSION_BUMP"
0 commit comments