Address comments

OffchainLabs · Sep 18, 2024 · 33b9b8b · 33b9b8b
1 parent 7cad700
commit 33b9b8b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 45 deletions.
diff --git a/.github/actions/check-is-hotfix/action.yml b/.github/actions/check-is-hotfix/action.yml
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -25,18 +25,6 @@ env:
   IS_HOTFIX: ${{ contains(github.event.pull_request.title, 'hotfix') }}
 
 jobs:
-  check-is-hotfix:
-    name: Check if PR is hotfix
-    runs-on: ubuntu-latest
-    outputs:
-      is_hotfix: ${{ steps.check-is-hotfix.outputs.is_hotfix }}
-    env:  
-      IS_HOTFIX: ${{ contains(github.event.pull_request.title, 'hotfix') }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/check-is-hotfix
-        id: check-is-hotfix
-
   check-files:
     name: Check files
     runs-on: ubuntu-latest
@@ -119,8 +107,7 @@ jobs:
 
   e2e-tests:
     name: "E2E Tests"
-    needs: [build, check-is-hotfix, check-files]
-    if: needs.check-is-hotfix.outputs.is_hotfix == 'false' && needs.check-files.outputs.run_tests == 'true'
+    needs: [build, check-files]
     uses: ./.github/workflows/e2e-tests.yml
     with:
       test_type: 'regular'

diff --git a/.github/workflows/run-cctp-tests.yml b/.github/workflows/run-cctp-tests.yml
@@ -9,7 +9,6 @@ on:
       - submitted
   push:
     branches: ["master"]
-  workflow_dispatch:
   merge_group:
 
 # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#concurrency
@@ -25,18 +24,6 @@ env:
   IS_HOTFIX: ${{ contains(github.event.pull_request.title, 'hotfix') }}
 
 jobs:
-  check-is-hotfix:
-    name: Check if PR is hotfix
-    runs-on: ubuntu-latest
-    outputs:
-      is_hotfix: ${{ steps.check-is-hotfix.outputs.is_hotfix }}
-    env:  
-      IS_HOTFIX: ${{ contains(github.event.pull_request.title, 'hotfix') }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/check-is-hotfix
-        id: check-is-hotfix
-
   check-files:
     name: Check files
     runs-on: ubuntu-latest
@@ -50,8 +37,8 @@ jobs:
   build:
     name: "Build"
     runs-on: ubuntu-latest
-    needs: [check-files, check-is-hotfix]
-    if: needs.check-files.outputs.run_tests == 'true' && needs.check-is-hotfix.outputs.is_hotfix == 'false'
+    needs: [check-files]
+    if: (needs.check-files.outputs.run_tests == 'true' && ${{ !contains(github.event.pull_request.title, 'hotfix') }}) || contains(github.event.comment.body, '/cctp')
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -72,9 +59,8 @@ jobs:
 
   cctp-e2e-tests:
     name: "CCTP E2E Tests"
-    needs: [build, check-is-hotfix, check-files]
+    needs: [build, check-files]
     # Only run CCTP tests when the PR was just approved
-    if: needs.check-is-hotfix.outputs.is_hotfix == 'false' && needs.check-files.outputs.run_tests == 'true' && github.event_name == 'pull_request_review' && github.event.review.state == 'approved'
     uses: ./.github/workflows/e2e-tests.yml
     with:
       test_type: 'cctp'