Skip to content

Commit

Permalink
Merge pull request #30 from FreshRSS/sync-upstream
Browse files Browse the repository at this point in the history
Sync upstream
  • Loading branch information
Alkarex authored Sep 27, 2024
2 parents 5e92ce7 + 449cd65 commit 530afaf
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
20 changes: 14 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,18 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
php:
- '7.2'
- '7.3'
- '7.4'
- '8.0'
- '8.1'
- '8.2'
- '8.3'
- '8.4'

name: "PHP: ${{ matrix.php }}"
continue-on-error: ${{ matrix.php == '8.3' }}
continue-on-error: ${{ matrix.php == '8.4' }}

steps:
- name: Checkout code
Expand All @@ -63,12 +71,12 @@ jobs:

# Install dependencies and handle caching in one go.
# @link https://github.com/marketplace/actions/install-composer-dependencies
- name: "Install Composer dependencies (PHP < 8.3)"
if: ${{ matrix.php < '8.3' }}
- name: "Install Composer dependencies (PHP < 8.4)"
if: ${{ matrix.php < '8.4' }}
uses: "ramsey/composer-install@v2"

- name: "Install Composer dependencies (PHP 8.3)"
if: ${{ matrix.php >= '8.3' }}
- name: "Install Composer dependencies (PHP 8.4)"
if: ${{ matrix.php >= '8.4' }}
uses: "ramsey/composer-install@v2"
with:
composer-options: --ignore-platform-reqs
Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
},
"config": {
"bin-dir": "bin",
"lock": false,
"sort-packages": true
},
"scripts": {
Expand Down

0 comments on commit 530afaf

Please sign in to comment.