Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into master #148

Merged
merged 36 commits into from
Jan 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
461508b
build(deps): bump follow-redirects from 1.15.1 to 1.15.4
dependabot[bot] Jan 10, 2024
8b1c656
Merge pull request #134 from PrestaShop/dependabot/npm_and_yarn/follo…
Progi1984 Jan 10, 2024
9a11f79
fix: add commit sha
elodie-bil3 Jan 16, 2024
f1e1ef1
fix: add commit sha
elodie-bil3 Jan 16, 2024
9367030
fix: testing
elodie-bil3 Jan 16, 2024
fbef35b
fix: testing
elodie-bil3 Jan 16, 2024
5f7573f
fix: testing
elodie-bil3 Jan 16, 2024
30745f5
fix: validate tag var
elodie-bil3 Jan 16, 2024
adb4a94
fix: validate tag var
elodie-bil3 Jan 16, 2024
bd7b323
fix: validate tag var
elodie-bil3 Jan 16, 2024
8ead695
fix: remive testing
elodie-bil3 Jan 16, 2024
d263e11
fix: testing
elodie-bil3 Jan 17, 2024
68f00d6
fix: testing
elodie-bil3 Jan 17, 2024
73daf3b
fix: testing
elodie-bil3 Jan 17, 2024
9a6a0ee
Merge pull request #135 from PrestaShop/fix/ci-deployment
elodie-bil3 Jan 17, 2024
a6641b1
build(deps): bump ip from 1.1.8 to 1.1.9
dependabot[bot] Feb 22, 2024
29eb381
Merge pull request #136 from PrestaShop/dependabot/npm_and_yarn/ip-1.1.9
Progi1984 Feb 22, 2024
29ea8f1
build(deps): bump follow-redirects from 1.15.4 to 1.15.6
dependabot[bot] Mar 16, 2024
3ee484c
Merge pull request #137 from PrestaShop/dependabot/npm_and_yarn/follo…
Progi1984 Mar 17, 2024
bb25390
build(deps): bump webpack-dev-middleware from 5.3.3 to 5.3.4
dependabot[bot] Mar 23, 2024
1b1f121
Merge pull request #138 from PrestaShop/dependabot/npm_and_yarn/webpa…
Progi1984 Mar 23, 2024
b1bff00
build(deps): bump glob-parent from 5.1.0 to 5.1.2
dependabot[bot] Jun 27, 2024
b51c511
Merge pull request #139 from PrestaShop/dependabot/npm_and_yarn/glob-…
Progi1984 Jun 27, 2024
9d03334
build(deps): bump serve-static
dependabot[bot] Sep 14, 2024
797b74a
Merge pull request #141 from PrestaShop/dependabot/npm_and_yarn/multi…
Progi1984 Sep 14, 2024
7cf3bd0
build(deps): bump elliptic from 6.5.4 to 6.5.7
dependabot[bot] Sep 14, 2024
13060ae
Merge pull request #142 from PrestaShop/dependabot/npm_and_yarn/ellip…
Progi1984 Sep 15, 2024
878b747
build(deps): bump elliptic from 6.5.7 to 6.6.0
dependabot[bot] Oct 31, 2024
fac8b72
Merge pull request #143 from PrestaShop/dependabot/npm_and_yarn/ellip…
Progi1984 Oct 31, 2024
e4d318e
Add 8.2.x brach
Touxten Nov 23, 2024
83bd2b4
Add missing Branch
Touxten Nov 23, 2024
454a969
Merge pull request #144 from Touxten/okom3pom-patch-1
Progi1984 Nov 23, 2024
b49a7a0
build(deps): bump nanoid from 3.3.4 to 3.3.8
dependabot[bot] Dec 11, 2024
5f2561d
Merge pull request #145 from PrestaShop/dependabot/npm_and_yarn/nanoi…
Progi1984 Dec 11, 2024
8c0785a
Server side pagination
Progi1984 Jan 14, 2025
9f06573
Merge pull request #147 from Progi1984/pagination
Progi1984 Jan 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .github/workflows/integration-cd.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Integration CD for QAnightly
name: Integration CD for nightly board

on:
pull_request:
Expand Down Expand Up @@ -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'

7 changes: 6 additions & 1 deletion .github/workflows/preproduction-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
7 changes: 6 additions & 1 deletion .github/workflows/production-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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/'
Expand Down
Loading
Loading