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.

Sign up for GitHub

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 80x to develop #23

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

Merge 80x to develop #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2d12518
fix conflicts
matthieu-rolland Nov 17, 2022
7c62ca7
fix tests and phpstan
matthieu-rolland Nov 18, 2022
531d3a4
cs fixer
matthieu-rolland Nov 18, 2022
b86d7b9
eslint
matthieu-rolland Nov 18, 2022
2eb058c
fix incorrect case for phpstan
matthieu-rolland Nov 18, 2022
0517017
correction so that ui tests pass
Nov 21, 2022
9491a6b
fix on ui test
Nov 22, 2022
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
2 changes: 1 addition & 1 deletion .github/actions/setup-prestashop-env/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ runs:
- name: Get Composer Cache Directory
shell: bash
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache Composer Directory
uses: actions/cache@v3
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/behaviour.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.0
with:
all_but_latest: true
access_token: ${{ github.token }}

- name: Setup PHP
Expand All @@ -31,11 +32,11 @@ jobs:
mysql database: 'prestashop'
mysql root password: 'password'
- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '14'

- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: PrestaShop Configuration
run: |
Expand All @@ -44,17 +45,17 @@ jobs:

- name: Get Composer Cache Directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache Node Directory
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: ${{ runner.os }}-node-

- name: Cache Composer Directory
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cron_docker_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- fpm

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0

Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/cron_js_routing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ jobs:
mysql root password: 'password'

- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}

- name: Setup NPM
run: npm install -g npm@7

- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0
ref: ${{ env.GH_BRANCH }}
Expand All @@ -66,19 +66,18 @@ jobs:

- name: Get Composer Cache Directory
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache Node Directory
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-

- name: Cache Composer Directory
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cron_nightly_build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
GC_SERVICE_KEY: ${{ secrets.GC_SERVICE_KEY }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
ref: ${{ env.GH_BRANCH }}
Expand All @@ -51,7 +51,7 @@ jobs:
extensions: mbstring, intl, gd, xml, dom, json, fileinfo, curl, zip, iconv

- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cron_nightly_gcp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
NIGHTLY_TOKEN: ${{ secrets.NIGHTLY_TOKEN }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
ref: ${{ env.GH_BRANCH }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/cron_nightly_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
ADMIN_PASSWD: 'Correct Horse Battery Staple'

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
ref: ${{ env.GH_BRANCH }}
Expand All @@ -78,7 +78,7 @@ jobs:
bash -c 'while [[ "$(curl -L -s -o /dev/null -w %{http_code} http://localhost:8001/en/)" != "200" ]]; do sleep 5; done'

- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}

Expand All @@ -104,7 +104,7 @@ jobs:
FILENAME="$( echo -e '${{ env.TEST_CAMPAIGN }}' | tr ':' '-' )"
mv ./mochawesome-report/mochawesome.json ${{ env.REPORTS_DIR_PATH }}/${FILENAME}.json

- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
name: Upload report
with:
name: reports_${{ env.GH_BRANCH }}
Expand All @@ -131,19 +131,19 @@ jobs:
COMBINED_REPORT_DIR: 'combined_reports' # Where to store the combined report

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0
ref: ${{ env.GH_BRANCH }}

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
name: Download reports
with:
name: reports_${{ env.GH_BRANCH }}
path: ${{ env.REPORTS_DIR }}

- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cron_php_update_modules.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
extensions: mbstring, intl, gd, xml, dom, json, fileinfo, curl, zip, iconv, simplexml

- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0
ref: ${{ env.GH_BRANCH }}
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ jobs:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.0
with:
all_but_latest: true
access_token: ${{ github.token }}

- name: Setup PHP
Expand All @@ -31,14 +32,14 @@ jobs:
mysql database: 'prestashop'
mysql root password: 'password'
- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '16'

- name: Setup NPM
run: npm install -g npm@7

- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: PrestaShop Configuration
run: |
Expand All @@ -47,17 +48,17 @@ jobs:

- name: Get Composer Cache Directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache Node Directory
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: ${{ runner.os }}-node-

- name: Cache Composer Directory
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/js.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,25 @@ jobs:
matrix:
js: [ '16' ]
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.0
with:
all_but_latest: true
access_token: ${{ github.token }}

- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.js }}

- name: Setup NPM
run: npm install -g npm@7

- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Cache Node Directory
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
Expand Down
58 changes: 45 additions & 13 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,16 @@ jobs:
name: SCSS Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.0
with:
all_but_latest: true
access_token: ${{ github.token }}

- uses: actions/checkout@v3

- name: Setup Node
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: '16.x'

Expand All @@ -23,14 +29,21 @@ jobs:

- name: BackOffice Theme `default`
run: cd ./admin-dev/themes/default && npm install && npm run scss-lint

eslint:
name: ESLint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.0
with:
all_but_latest: true
access_token: ${{ github.token }}

- uses: actions/checkout@v3

- name: Setup Node
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: '16.x'

Expand All @@ -48,23 +61,29 @@ jobs:

- name: BackOffice Theme `new-theme`
run: cd ./admin-dev/themes/new-theme && npm install && npm run lint

yamllint_sf:
name: YAML Lint (Symfony Check)
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.0
with:
all_but_latest: true
access_token: ${{ github.token }}

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
extensions: mbstring, intl, gd, xml, dom, json, fileinfo, curl, zip, iconv, simplexml
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Get Composer Cache Directory
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache Composer Directory
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand All @@ -82,17 +101,24 @@ jobs:

- name: Run Lint Yaml on `.t9n.yml`
run: php bin/console lint:yaml .t9n.yml

yamllint:
name: YAML Lint (YamlLint Check)
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.0
with:
all_but_latest: true
access_token: ${{ github.token }}

- uses: actions/setup-python@v2
with:
python-version: '3.x'
- name: Install YAMLLint
run: |
pip install --user yamllint
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: yamllint on `.github`
run: yamllint -c .github/workflows/yamllint/.yamllint.yml .github
Expand All @@ -105,23 +131,29 @@ jobs:

- name: yamllint on `.t9n.yml`
run: yamllint -c .github/workflows/yamllint/.yamllint.yml .t9n.yml

twiglint:
name: Twig Lint
runs-on: ubuntu-latest
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.0
with:
all_but_latest: true
access_token: ${{ github.token }}

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
extensions: mbstring, intl, gd, xml, dom, json, fileinfo, curl, zip, iconv, simplexml
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Get Composer Cache Directory
id: composer-cache
run: |
echo "::set-output name=dir::$(composer config cache-files-dir)"
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Cache Composer Directory
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
Expand Down
Loading