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

Fix CI setup #60

Merged
merged 4 commits into from
Sep 24, 2024
Merged

Fix CI setup #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f1ec97
Fix CI setup
stof Sep 24, 2024
bf612c9
Fix the handling of the league version in the CI setup
stof Sep 24, 2024
6b11fd3
Bump the min version of the league package
stof Sep 24, 2024
ed28e47
Remove uploading the code coverage to scrutinizer
stof Sep 24, 2024
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
22 changes: 3 additions & 19 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,13 @@ jobs:
- run: composer validate --strict --no-check-lock

tests:
name: "Tests on PHP ${{ matrix.php }}${{ matrix.name_suffix }}"
name: "Tests on PHP ${{ matrix.php }}"
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
php: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
league_version: [ '' ] # Run jobs without changing the requirement from composer.json
name_suffix: [ '' ]
include:
- php: '5.6'
league_version: '5.1.*'
name_suffix: ' with League 5.1'
- php: '7.4'
league_version: '>=8.0.0 <=8.3.1'
name_suffix: ' with League 8.3.1'
php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ]

steps:
- uses: actions/checkout@v4
Expand All @@ -46,10 +37,6 @@ jobs:
php-version: "${{ matrix.php }}"
ini-file: development

- name: Update league requirement
if: matrix.league_version != ''
run: composer require league/oauth2-server:"$LEAGUE_VERSION" --no-update

- name: Update permissions
run: |
chmod 600 tests/Stubs/private.key
Expand All @@ -59,7 +46,4 @@ jobs:
run: composer update --ansi --no-progress --no-interaction

- name: Run tests
run: php -d error_reporting="E_ALL & ~E_USER_DEPRECATED" vendor/bin/phpunit -v --colors=always --coverage-clover=coverage.clover

- name: Upload coverage
run: 'wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover'
run: php -d error_reporting="E_ALL & ~E_USER_DEPRECATED" vendor/bin/phpunit -v --colors=always
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ This implements the OpenID Connect specification on top of The PHP League's [OAu

## Requirements

* Requires PHP version 7.2 or greater.
* [league/oauth2-server](https://github.com/thephpleague/oauth2-server) 5.1 or greater.
* Requires PHP version 7.4 or greater.
* [league/oauth2-server](https://github.com/thephpleague/oauth2-server) 8.4.2 or greater.

Note: league/oauth2-server version may have a higher PHP requirement.

Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
}
],
"require": {
"php": ">=7.2",
"league/oauth2-server": "^5.1|^6.0|^7.0|^8.0|^9.0",
"php": ">=7.4",
"league/oauth2-server": "^8.4.2|^9.0",
"lcobucci/jwt": "4.1.5|^4.2|^4.3|^5.0"
},
"require-dev": {
Expand Down