Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
matthieu2607 committed Mar 25, 2024
2 parents e895605 + 976e1e7 commit 5271aaf
Show file tree
Hide file tree
Showing 5 changed files with 8,069 additions and 33 deletions.
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
.gitattributes export-ignore
.github/ export-ignore
.gitignore export-ignore
.changelogs.md export-ignore
.CHANGELOG.md export-ignore
.composer.json.ci export-ignore

# Development files
ecs.php export-ignore
Expand Down
66 changes: 35 additions & 31 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,40 @@
name: Plausible (Magento 2) for code review

on:
push:
branches: ["main", "develop"]
pull_request:
branches: ["main", "develop"]
push:
branches: [ "main", "develop" ]
pull_request:
branches: [ "main", "develop" ]

jobs:
review:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
with:
extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite, mysql, zip

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v3
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-
- name: Install dependencies
run: composer install --no-interaction --no-progress

- name: Check for vulnerabilities
uses: symfonycorp/security-checker-action@v4

- name: Run Easy Coding Standard
run: vendor/bin/ecs check
review:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Setup PHP, with composer and extensions
uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
with:
php-version: '8.2'
extensions: mbstring, xml, ctype, iconv, intl, pdo_sqlite, mysql, zip

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v3
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-php-
- name: Copy composer for ci
run: php -r "copy('composer.json.ci', 'composer.json');"

- name: Add HTTP basic auth credentials
run: echo '${{ secrets.COMPOSER_AUTH_JSON }}' > $GITHUB_WORKSPACE/auth.json

- name: Install dependencies
run: composer install --no-interaction --no-progress

- name: Run Easy Coding Standard
run: vendor/bin/ecs check
9 changes: 8 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@
"name": "pixelopen/magento-plausible",
"description": "Add Plausible Analytics to Magento",
"require": {
"php": "^8"
"php": "^8",
"magento/module-backend": "*",
"magento/module-checkout": "*",
"magento/module-config": "*",
"magento/module-contact": "*",
"magento/module-customer": "*",
"magento/module-store": "*",
"magento/framework": "*"
},
"type": "magento2-module",
"version": "100.2.1",
Expand Down
45 changes: 45 additions & 0 deletions composer.json.ci
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"name": "pixelopen/magento-plausible",
"description": "Add Plausible Analytics to Magento",
"require": {
"php": "^8",
"magento/module-backend": "*",
"magento/module-checkout": "*",
"magento/module-config": "*",
"magento/module-contact": "*",
"magento/module-customer": "*",
"magento/module-store": "*",
"magento/framework": "*"
},
"type": "magento2-module",
"version": "100.2.1",
"autoload": {
"files": [
"registration.php"
],
"psr-4": {
"PixelOpen\\Plausible\\": ""
}
},
"repositories": [
{
"type": "composer",
"url": "https://repo.magento.com/"
}
],
"authors": [
{
"name": "Pixel Open",
"homepage": "https://pixel-open.org/",
"role": "Developer"
}
],
"config": {
"allow-plugins": {
"magento/composer-dependency-version-audit-plugin": true
}
},
"require-dev": {
"symplify/easy-coding-standard": "^12.1"
}
}
Loading

0 comments on commit 5271aaf

Please sign in to comment.