Skip to content

Commit

Permalink
Merge pull request #323 from fedeisas/Fix-github-actions
Browse files Browse the repository at this point in the history
Fix GitHub actions
  • Loading branch information
DannyvdSluijs authored Apr 11, 2024
2 parents 47c41ed + 035670c commit 01f0801
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
23 changes: 15 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: CI

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
test:
Expand Down Expand Up @@ -35,8 +35,15 @@ jobs:
allow_fail: false
name: 'PHP 8.2 with lowest stable deps'
composer_update_flags: '--prefer-lowest --prefer-stable'
- php: 8.3
allow_fail: false
name: 'PHP 8.3 with latest deps'
- php: 8.3
allow_fail: false
name: 'PHP 8.3 with lowest stable deps'
composer_update_flags: '--prefer-lowest --prefer-stable'
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4

- name: Setup PHP ${{ matrix.php }}
uses: shivammathur/setup-php@v2
Expand All @@ -47,10 +54,10 @@ 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 dependencies
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
Expand Down Expand Up @@ -78,6 +85,6 @@ jobs:
composer-normalize:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Composer normalize
uses: localheinz/[email protected]
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"tijsverkoyen/css-to-inline-styles": "~2.2"
},
"require-dev": {
"enlightn/security-checker": "^1.10",
"enlightn/security-checker": "^1.10 || ^2.0",
"guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
"guzzlehttp/psr7": "^1.9.1 || ^2.4.5",
"phpunit/phpunit": "^9.0",
Expand Down

0 comments on commit 01f0801

Please sign in to comment.