Merge pull request #106 from sawantpritam/run-required-tests

Update test run condition for workflow_dispatch
cdapio · Jun 29, 2022 · 0cdfbce · 0cdfbce
2 parents 229fc4b + 0c99ea8
commit 0cdfbce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/e2e-triggered.yml b/.github/workflows/e2e-triggered.yml
@@ -46,10 +46,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-${{ github.workflow }}
       - name: Run required e2e tests
-        if: ${{ github.event.pull_request.merged == false}}
+        if: ${{ github.event_name != 'workflow_dispatch' && github.event.pull_request.merged == false}}
         run: python3 e2e/src/main/scripts/run_e2e_test.py TestRunnerRequired.java
-      - name: Run all e2e tests if PR is merged
-        if: ${{ github.event.pull_request.merged == true}}
+      - name: Run all e2e tests
+        if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true}}
         run: python3 e2e/src/main/scripts/run_e2e_test.py
       - name: Upload report 
         uses: actions/upload-artifact@v2.2.4

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -60,8 +60,8 @@ jobs:
       - name: Run required e2e tests
         if: ${{ github.event.pull_request.merged == false}}
         run: python3 e2e/src/main/scripts/run_e2e_test.py TestRunnerRequired.java
-      - name: Run all e2e tests if PR is merged
-        if: ${{ github.event.pull_request.merged == true}}
+      - name: Run all e2e tests
+        if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true}}
         run: python3 e2e/src/main/scripts/run_e2e_test.py
       - name: Upload report 
         uses: actions/upload-artifact@v2.2.4