Skip to content
This repository has been archived by the owner on May 26, 2023. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/2.2.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
titouanmathis committed May 26, 2023
2 parents 7abb1a7 + 402ecb7 commit 8f43d40
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 9 deletions.
8 changes: 2 additions & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ include:
- config/node/npm-install.yml
- config/node/eslint.yml
- config/node/stylelint.yml
- config/node/prettier-twig.yml
- config/node/prettier.yml
- config/php/composer-install.yml
- config/php/phpcs.yml
- config/php/phpstan.yml
Expand All @@ -29,15 +29,11 @@ node_stylelint:
variables:
STYLELINT_ARGS: 'web/wp-content/themes/studiometa/src/**/*.scss'

node_prettier_twig:
node_prettier:
variables:
PRETTIER_ARGS: 'web/wp-content/themes/studiometa/templates/**/*.twig'

php_phpcs:
variables:
PHPCS_ARGS: --extensions=php --standard=./phpcs.xml --report=\\Satesh\\Phpcs\\GitLabReport --report-file=gl-phpcs-codequality.json

php_phpstan:
variables:
PHP_EXEC_CMD_ARGS: -e 'XDEBUG_MODE=off'
PHPSTAN_ARGS: analyse --error-format=gitlab > gl-phpstan-codequality.json
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Changelog

Tous les changements notables de ce projet seront documentés dans ce fichier. Le format est basé sur [Keep a Changelog](https://keepachangelog.com/fr/1.0.0/),
et ce projet suit les règles du [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
Tous les changements notables de ce projet seront documentés dans ce fichier. Le format est basé sur [Keep a Changelog](https://keepachangelog.com/fr/1.0.0/), et ce projet suit les règles du [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Non publié
File renamed without changes.
2 changes: 1 addition & 1 deletion jsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"noImplicitThis": true,
"esModuleInterop": true,
"lib": ["esnext", "dom"],
"moduleResolution": "node"
"moduleResolution": "bundler"
}
}

0 comments on commit 8f43d40

Please sign in to comment.