Skip to content

Commit 19967ea

Browse files
committed
Merge branch 'main' into fix/icc-requires-srgb
2 parents 6287252 + d1f060d commit 19967ea

6 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎.github/workflows/dependabot-auto-merge.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
- name: Dependabot metadata
1515
id: metadata
16-
uses: dependabot/fetch-metadata@v2.4.0
16+
uses: dependabot/fetch-metadata@v2.5.0
1717
with:
1818
github-token: "${{ secrets.GITHUB_TOKEN }}"
1919

‎.github/workflows/php-cs-fixer.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88

99
steps:
1010
- name: Checkout code
11-
uses: actions/checkout@v5
11+
uses: actions/checkout@v6
1212
with:
1313
ref: ${{ github.head_ref }}
1414

‎.github/workflows/phpstan.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ jobs:
77
runs-on: ubuntu-latest
88

99
steps:
10-
- uses: actions/checkout@v5
10+
- uses: actions/checkout@v6
1111

1212
- name: Setup PHP
1313
uses: shivammathur/setup-php@v2
1414
with:
15-
php-version: "8.1"
15+
php-version: "8.3"
1616

1717
- name: Cache composer dependencies
18-
uses: actions/cache@v4
18+
uses: actions/cache@v5
1919
with:
2020
path: vendor
2121
key: composer-${{ hashFiles('composer.lock') }}

‎.github/workflows/run-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ jobs:
99
fail-fast: true
1010
matrix:
1111
os: [ubuntu-latest, windows-latest]
12-
php: [8.1, 8.2, 8.3]
12+
php: [8.3, 8.4]
1313
stability: [prefer-lowest, prefer-stable]
1414

1515
name: P${{ matrix.php }} - ${{ matrix.stability }} - ${{ matrix.os }}
1616

1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@v5
19+
uses: actions/checkout@v6
2020

2121
- name: Setup PHP
2222
uses: shivammathur/setup-php@v2

‎.github/workflows/update-changelog.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
steps:
1212
- name: Checkout code
13-
uses: actions/checkout@v5
13+
uses: actions/checkout@v6
1414
with:
1515
ref: main
1616

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616
],
1717
"require": {
18-
"php": "^8.1|^8.2|^8.3"
18+
"php": "^8.3|^8.4"
1919
},
2020
"require-dev": {
2121
"friendsofphp/php-cs-fixer": "^3.85",

0 commit comments

Comments
 (0)