Merge pull request PrestaShop#50 from jolelievre/missing-merge

Add missing management of merge in checkout action
AureRita · Sep 25, 2023 · bbeb9ea · bbeb9ea
2 parents 9e95ce5 + 3f5111e
commit bbeb9ea
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/.github/workflows/actions/checkout-prestashop/action.yml b/.github/workflows/actions/checkout-prestashop/action.yml
@@ -51,6 +51,14 @@ runs:
         git rebase origin/${{ inputs.base_branch }}
       shell: bash
 
+    - name: Merge
+      working-directory: ${{ inputs.ps_dir }}
+      if: ${{ inputs.rebase_or_merge == 'merge' }}
+      run: |
+        git fetch origin ${{ inputs.base_branch }}:${{ inputs.base_branch }}
+        git merge origin/${{ inputs.base_branch }}
+      shell: bash
+
     # Workaround until https://github.com/PrestaShop/PrestaShop/issues/29813 is fixed
     - name: PrestaShop Configuration (Copy of Config API)
       if: (inputs.base_branch == '8.1.x') || (inputs.base_branch == 'develop')