Skip to content

Commit

Permalink
Merge pull request #227 from TheDragonCode/4.x
Browse files Browse the repository at this point in the history
Small fix
  • Loading branch information
andrey-helldar committed Mar 27, 2024
2 parents 6454318 + 99baa6e commit cf4add6
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/code-style.yml
Expand Up @@ -10,6 +10,8 @@ jobs:

if: ${{ github.event_name != 'push' || github.ref != 'refs/heads/main' }}

name: Check

steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -31,6 +33,8 @@ jobs:

if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}

name: Fix

steps:
- name: Checkout code
uses: actions/checkout@v4
Expand All @@ -41,8 +45,10 @@ jobs:
extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv, json
coverage: none

- name: Setup Dependencies
- name: Setup Composer
run: |
composer global config github-oauth.github.com ${{ secrets.COMPOSER_TOKEN }}
composer global config --no-plugins allow-plugins.dragon-code/codestyler true
composer global config --no-plugins allow-plugins.ergebnis/composer-normalize true
composer global config --no-plugins allow-plugins.symfony/thanks true
Expand All @@ -51,7 +57,7 @@ jobs:
composer config --no-plugins allow-plugins.ergebnis/composer-normalize true
composer config --no-plugins allow-plugins.symfony/thanks true
- name: Install dependency
- name: Install dependencies
run: |
composer global require dragon-code/codestyler
composer global require ergebnis/composer-normalize
Expand Down
6 changes: 4 additions & 2 deletions README.md
Expand Up @@ -208,8 +208,10 @@ jobs:
extensions: curl, mbstring, zip, pcntl, pdo, pdo_sqlite, iconv, json
coverage: none

- name: Setup Dependencies
- name: Setup Composer
run: |
composer global config github-oauth.github.com ${{ secrets.COMPOSER_TOKEN }}
composer global config --no-plugins allow-plugins.dragon-code/codestyler true
composer global config --no-plugins allow-plugins.ergebnis/composer-normalize true
composer global config --no-plugins allow-plugins.symfony/thanks true
Expand All @@ -218,7 +220,7 @@ jobs:
composer config --no-plugins allow-plugins.ergebnis/composer-normalize true
composer config --no-plugins allow-plugins.symfony/thanks true
- name: Install dependency
- name: Install dependencies
run: |
composer global require dragon-code/codestyler
composer global require ergebnis/composer-normalize
Expand Down
2 changes: 1 addition & 1 deletion dev.sh
@@ -1,3 +1,3 @@
#!/bin/sh -l

act -W '.github/workflows/code-style-dev.yml'
act -W '.github/workflows/code-style.yml'

0 comments on commit cf4add6

Please sign in to comment.