Merge pull request #148 from PrestaShop/develop

Merge `develop` into `master`
PrestaShop · Jan 15, 2025 · 186de8a · 186de8a
2 parents c4b67e4 + 9f06573
commit 186de8a
Show file tree

Hide file tree

Showing 6 changed files with 179 additions and 229 deletions.
diff --git a/.github/workflows/integration-cd.yml b/.github/workflows/integration-cd.yml
@@ -1,4 +1,4 @@
-name: Integration CD for QAnightly
+name: Integration CD for nightly board
 
 on:
   pull_request:
@@ -28,11 +28,17 @@ jobs:
         id: branch
         uses: tj-actions/branch-names@v7.0.7
 
+      - name: Get tag
+        shell: bash
+        id: get_tag
+        run: echo TAG=$PREFIX_TAG$(echo $GITHUB_REF | cut -d / -f 3) >> $GITHUB_OUTPUT
+
       - name: Trigger CI / CD
         uses: aurelien-baudet/workflow-dispatch@v2
         with:
           workflow: integration-cd.yml
           repo: PrestaShopCorp/qanightlyresults-cd
-          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "bulle": "${{ steps.get_bulle.outputs.BULLE }}", "project": "nightly", "repository": "PrestaShop/nightly-board"}'
+          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "bulle": "${{ steps.get_bulle.outputs.BULLE }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "tag": "${{ steps.get_tag.outputs.TAG }}", "commit": "${{ github.sha }}"}'
           token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
-          ref: 'refs/heads/main'
+          ref: 'refs/heads/main'
+
diff --git a/.github/workflows/preproduction-cd.yml b/.github/workflows/preproduction-cd.yml
@@ -20,11 +20,16 @@ jobs:
         id: branch
         uses: tj-actions/branch-names@v7.0.7
 
+      - name: Get tag
+        shell: bash
+        id: get_tag
+        run: echo TAG=$PREFIX_TAG$(echo $GITHUB_REF | cut -d / -f 3) >> $GITHUB_OUTPUT
+
       - name: Trigger CI / CD
         uses: aurelien-baudet/workflow-dispatch@v2
         with:
           workflow: preproduction-cd.yml
           repo: PrestaShopCorp/qanightlyresults-cd
-          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "project": "nightly", "repository": "PrestaShop/nightly-board"}'
+          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "tag": "${{ steps.get_tag.outputs.TAG }}", "commit": "${{ github.sha }}"}'
           token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
           ref: 'refs/heads/main'
diff --git a/.github/workflows/production-cd.yml b/.github/workflows/production-cd.yml
@@ -19,11 +19,16 @@ jobs:
         id: branch
         uses: tj-actions/branch-names@v7.0.7
 
+      - name: Get tag
+        shell: bash
+        id: get_tag
+        run: echo TAG=$PREFIX_TAG$(echo $GITHUB_REF | cut -d / -f 3) >> $GITHUB_OUTPUT
+
       - name: Trigger CI / CD
         uses: aurelien-baudet/workflow-dispatch@v2
         with:
           workflow: production-cd.yml
           repo: PrestaShopCorp/qanightlyresults-cd
-          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "project": "nightly", "repository": "PrestaShop/nightly-board"}'
+          inputs: '{ "branch": "${{ steps.branch.outputs.current_branch }}", "project": "nightly", "repository": "PrestaShop/nightly-board", "tag": "${{ steps.get_tag.outputs.TAG }}", "commit": "${{ github.sha }}"}'
           token: ${{ secrets.TERRAFORM_ACCESS_TOKEN }}
           ref: 'refs/heads/main'
diff --git a/nuxt.config.js b/nuxt.config.js
@@ -2,7 +2,7 @@
 const pkg = require('./package')
 
 module.exports = {
-  mode: 'universal',
+  ssr: true,
   env: {
     ga: process.env.QANB_GA || 'UA-XXXXXXXX-X',
     DOMAIN_URL: process.env.QANB_API_DOMAIN || 'http://www.qa.local/'