Merge pull request #305 from sohosai/CD-fix

fix: Update cd.yml
sohosai · Apr 25, 2024 · f998737 · f998737
2 parents 39bbd0b + 1f0f621
commit f998737
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -15,8 +15,8 @@ env:
 jobs:
   build_and_deploy:
     if: |
-      (github.event_name == 'push' && ((github.head_ref || github.ref_name) != 'main' )) ||
-      (github.event_name == 'pull_request' && github.event.pull_request.merged == true) ||
+      (github.event_name == 'push' && ((github.head_ref || github.ref_name) != 'main' )) || 
+      github.event.pull_request.merged == true ||
       github.event_name == 'workflow_dispatch'
     runs-on: [self-hosted, garm]
     permissions: