Allow running tests without PR number

PrestaShop · Oct 2, 2023 · 33f1277 · 33f1277
1 parent 5d25adc
commit 33f1277
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/actions/checkout-prestashop/action.yml b/.github/workflows/actions/checkout-prestashop/action.yml
@@ -62,7 +62,7 @@ runs:
 
     # Or simply get the branch/tag
     - name: Get ref from repository ${{ inputs.repository_ref }}
-      if: inputs.pr_number == '' && inputs.rebase_or_merge == '' && inputs.repository_ref != 'develop'
+      if: inputs.pr_number == '' && inputs.repository_ref != 'develop'
       working-directory: ${{ inputs.ps_dir }}
       run: |
         git fetch origin ${{ inputs.repository_ref }}:${{ inputs.repository_ref }}

diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
@@ -3,8 +3,9 @@ on:
   workflow_dispatch:
     inputs:
       pr_number:
-        description: Pull request Id
-        required: true
+        description: Pull request Id (leave empty to test branch/version only)
+        required: false
+        default: ''
       base_branch:
         type: choice
         description: Base branch to rebase the PR

diff --git a/.github/workflows/pr_test_single_campaign.yml b/.github/workflows/pr_test_single_campaign.yml
@@ -3,8 +3,9 @@ on:
   workflow_dispatch:
     inputs:
       pr_number:
-        description: Pull request Id
-        required: true
+        description: Pull request Id (leave empty to test branch/version only)
+        required: false
+        default: ''
       base_branch:
         type: choice
         description: Base branch to rebase the PR

diff --git a/.github/workflows/test-sanity.yml b/.github/workflows/test-sanity.yml
@@ -76,7 +76,8 @@ jobs:
       - name: Checkout PrestaShop
         uses: ./custom_actions/.github/workflows/actions/checkout-prestashop
         with:
-          repository_ref: ${{ inputs.pr_number }}
+          repository_ref: ${{ inputs.repository_ref }}
+          pr_number: ${{ inputs.pr_number }}
           rebase_or_merge: ${{ inputs.rebase_or_merge }}
           backoffice_layout: ${{ inputs.backoffice_layout }}
           ps_dir: ${{ env.PS_DIR }}