Merge pull request PrestaShop#75 from jolelievre/add-branch-82

Add PrestaShop 8.2.x branch
tleon · Sep 13, 2024 · 2542808 · 2542808
2 parents 76881e8 + ad682d4
commit 2542808
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 10 deletions.
diff --git a/.github/workflows/actions/checkout-prestashop/action.yml b/.github/workflows/actions/checkout-prestashop/action.yml
@@ -58,6 +58,6 @@ runs:
 
     # 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')
+      if: (inputs.base_branch == '8.1.x' || inputs.base_branch == '8.2.x')
       run: cp ./${{ inputs.ps_dir }}/app/config/security_test.yml ./${{ inputs.ps_dir }}/app/config/security_prod.yml
       shell: bash
diff --git a/.github/workflows/build-shop.yml b/.github/workflows/build-shop.yml
@@ -135,7 +135,7 @@ jobs:
 
       # Certificate
       - name: Generate a certificate
-        if: (inputs.base_branch == '8.1.x') || (inputs.base_branch == 'develop')
+        if: (inputs.base_branch == '8.1.x') || (inputs.base_branch == '8.2.x') || (inputs.base_branch == 'develop')
         run: |
           ## Install MkCert
           sudo apt-get update

diff --git a/.github/workflows/pr_security_test_one.yml b/.github/workflows/pr_security_test_one.yml
@@ -17,6 +17,7 @@ on:
         required: true
         options:
           - 'develop'
+          - '8.2.x'
           - '8.1.x'
           - '8.0.x'
           - '1.7.8.x'
@@ -183,6 +184,19 @@ jobs:
             TEST_CAMPAIGN: 'functional:FO:hummingbird:04-07'
           - BASE_BRANCH: 8.1.x
             TEST_CAMPAIGN: 'functional:FO:hummingbird:08-12'
+          ## 8.2.x
+          - BASE_BRANCH: 8.2.x
+            TEST_CAMPAIGN: 'functional:BO:advanced-parameters:11-12'
+          - BASE_BRANCH: 8.2.x
+            TEST_CAMPAIGN: 'functional:FO:01-03'
+          - BASE_BRANCH: 8.2.x
+            TEST_CAMPAIGN: 'functional:FO:04-07'
+          - BASE_BRANCH: 8.2.x
+            TEST_CAMPAIGN: 'functional:FO:08-12'
+          - BASE_BRANCH: 8.2.x
+            TEST_CAMPAIGN: 'functional:FO:hummingbird:04-07'
+          - BASE_BRANCH: 8.2.x
+            TEST_CAMPAIGN: 'functional:FO:hummingbird:08-12'
           ## develop
           - BASE_BRANCH: develop
             TEST_CAMPAIGN: 'functional:FO:01-03'
@@ -204,7 +218,7 @@ jobs:
           repository: ${{ inputs.GH_REPOSITORY }}
           token: ${{ inputs.GH_TOKEN }}
           ref: refs/pull/${{ inputs.PR_NUMBER }}/head
-          
+
       - name: Setup Environment
         timeout-minutes: 15
         uses: ./.github/actions/setup-env
@@ -219,7 +233,7 @@ jobs:
         env:
           ENABLE_SSL: ${{ ((inputs.BASE_BRANCH == '1.7.8.x') || (inputs.BASE_BRANCH == '8.0.x')) && 'false' || 'true' }}
           INSTALL_AUTO: ${{ (matrix.TEST_CAMPAIGN == 'sanity') && 'false' || 'true' }}
-          CP_API_CONFIG: ${{ (matrix.BASE_BRANCH == '8.1.x') && 'true' || 'false' }}
+          CP_API_CONFIG: ${{ ((matrix.BASE_BRANCH == '8.1.x') || (matrix.BASE_BRANCH == '8.2.x')) && 'true' || 'false' }}
       - name: Setup Environment failure
         uses: ./.github/actions/setup-env-export-logs
         with:

diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml
@@ -161,7 +161,7 @@ jobs:
             TEST_COMMAND: 'functional:FO:hummingbird:08-12'
           ## 8.2.x
           - BASE_BRANCH: 8.2.x
-            TEST_COMMAND: 'functional:FO:hummingbird:08-12'  
+            TEST_COMMAND: 'functional:FO:hummingbird:08-12'
 
   test-short-campaigns:
     name: Run short campaign ${{ matrix.TEST_COMMAND }}

diff --git a/.github/workflows/pr_test_one.yml b/.github/workflows/pr_test_one.yml
@@ -11,6 +11,7 @@ on:
         required: true
         options:
           - 'develop'
+          - '8.2.x'
           - '8.1.x'
           - '8.0.x'
           - '1.7.8.x'
@@ -186,6 +187,19 @@ jobs:
             TEST_CAMPAIGN: 'functional:FO:hummingbird:04-07'
           - BASE_BRANCH: 8.1.x
             TEST_CAMPAIGN: 'functional:FO:hummingbird:08-12'
+          ## 8.2.x
+          - BASE_BRANCH: 8.2.x
+            TEST_CAMPAIGN: 'functional:BO:advanced-parameters:11-12'
+          - BASE_BRANCH: 8.2.x
+            TEST_CAMPAIGN: 'functional:FO:01-03'
+          - BASE_BRANCH: 8.2.x
+            TEST_CAMPAIGN: 'functional:FO:04-07'
+          - BASE_BRANCH: 8.2.x
+            TEST_CAMPAIGN: 'functional:FO:08-12'
+          - BASE_BRANCH: 8.2.x
+            TEST_CAMPAIGN: 'functional:FO:hummingbird:04-07'
+          - BASE_BRANCH: 8.2.x
+            TEST_CAMPAIGN: 'functional:FO:hummingbird:08-12'
           ## develop
           - BASE_BRANCH: develop
             TEST_CAMPAIGN: 'functional:FO:01-03'
@@ -236,7 +250,7 @@ jobs:
         env:
           ENABLE_SSL: ${{ ((inputs.BASE_BRANCH == '1.7.8.x') || (inputs.BASE_BRANCH == '8.0.x')) && 'false' || 'true' }}
           INSTALL_AUTO: ${{ (matrix.TEST_CAMPAIGN == 'sanity') && 'false' || 'true' }}
-          CP_API_CONFIG: ${{ (matrix.BASE_BRANCH == '8.1.x') && 'true' || 'false' }}
+          CP_API_CONFIG: ${{ ((matrix.BASE_BRANCH == '8.1.x') || (matrix.BASE_BRANCH == '8.2.x')) && 'true' || 'false' }}
       - name: Setup Environment failure
         uses: ./.github/actions/setup-env-export-logs
         with:

diff --git a/.github/workflows/pr_test_single_campaign.yml b/.github/workflows/pr_test_single_campaign.yml
@@ -11,6 +11,7 @@ on:
         required: true
         options:
           - 'develop'
+          - '8.2.x'
           - '8.1.x'
           - '8.0.x'
           - '1.7.8.x'

diff --git a/.github/workflows/test-sanity.yml b/.github/workflows/test-sanity.yml
@@ -100,7 +100,7 @@ jobs:
 
       # Certificate
       - name: Generate a certificate
-        if: (inputs.base_branch == '8.1.x') || (inputs.base_branch == 'develop')
+        if: (inputs.base_branch == '8.1.x') || (inputs.base_branch == '8.2.x') || (inputs.base_branch == 'develop')
         run: |
           ## Install MkCert
           sudo apt-get update
@@ -199,7 +199,7 @@ jobs:
       # Playwright must be installed all the time, we only install chromium since it's the only browser used
       - name: Install browsers
         working-directory: ${{ env.PS_DIR }}/tests/UI
-        if: ${{ inputs.base_branch == '8.0.x' || inputs.base_branch == '8.1.x' }}
+        if: ${{ inputs.base_branch == '8.0.x' || inputs.base_branch == '8.1.x' || inputs.base_branch == '8.2.x' }}
         run: npx playwright install chromium
 
       - name: Install browsers

diff --git a/.github/workflows/test-with-prebuilt-shop.yml b/.github/workflows/test-with-prebuilt-shop.yml
@@ -100,7 +100,7 @@ jobs:
 
       # Certificate
       - name: Generate a certificate
-        if: (inputs.base_branch == '8.1.x') || (inputs.base_branch == 'develop')
+        if: (inputs.base_branch == '8.1.x') || (inputs.base_branch == '8.2.x') || (inputs.base_branch == 'develop')
         run: |
           ## Install MkCert
           sudo apt-get update
@@ -171,7 +171,7 @@ jobs:
       # Playwright must be installed all the time, we only install chromium since it's the only browser used
       - name: Install browsers
         working-directory: ${{ env.PS_DIR }}/tests/UI
-        if: ${{ inputs.base_branch == '8.0.x' || inputs.base_branch == '8.1.x' }}
+        if: ${{ inputs.base_branch == '8.0.x' || inputs.base_branch == '8.1.x' || inputs.base_branch == '8.2.x' }}
         run: npx playwright install chromium
 
       - name: Install browsers