Skip to content

Commit 0784e2f

Browse files
authored
Merge pull request #374 from EasyPost/EXP-715_php84_php85
chore: test against php 8.4 and php 8.5
2 parents b140802 + 69d7238 commit 0784e2f

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@ jobs:
1010
lint:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v5
13+
- uses: actions/checkout@v6
1414
- uses: shivammathur/setup-php@v2
1515
with:
16-
# TODO: Upgrade to PHP 8.5 when VCR releases a version compatible with it
17-
php-version: '8.3'
16+
php-version: '8.5'
1817
- name: install dependencies
1918
run: make install
2019
- name: lint
@@ -23,10 +22,9 @@ jobs:
2322
runs-on: ubuntu-latest
2423
strategy:
2524
matrix:
26-
# TODO: Add 8.4/8.5 when VCR releases a version compatible with it
27-
phpversion: ['8.1', '8.2', '8.3']
25+
phpversion: ['8.1', '8.2', '8.3', '8.4', '8.5']
2826
steps:
29-
- uses: actions/checkout@v5
27+
- uses: actions/checkout@v6
3028
- uses: shivammathur/setup-php@v2
3129
with:
3230
php-version: ${{ matrix.phpversion }}
@@ -35,7 +33,7 @@ jobs:
3533
id: composer-cache
3634
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
3735
- name: cache dependencies
38-
uses: actions/cache@v3
36+
uses: actions/cache@v5
3937
with:
4038
path: ${{ steps.composer-cache.outputs.dir }}
4139
key: ${{ runner.os }}-${{ matrix.phpversion }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -53,17 +51,16 @@ jobs:
5351
if: github.ref == 'refs/heads/master'
5452
runs-on: ubuntu-latest
5553
steps:
56-
- uses: actions/checkout@v5
54+
- uses: actions/checkout@v6
5755
- uses: shivammathur/setup-php@v2
5856
with:
59-
# TODO: Upgrade to PHP 8.5 when VCR releases a version compatible with it
60-
php-version: '8.3'
57+
php-version: '8.5'
6158
- name: Install Dependencies
6259
run: make install
6360
- name: Generate Docs
6461
run: make docs
6562
- name: Deploy Docs
66-
uses: peaceiris/actions-gh-pages@v3
63+
uses: peaceiris/actions-gh-pages@v4
6764
with:
6865
github_token: ${{ secrets.GITHUB_TOKEN }}
6966
publish_dir: docs

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"require-dev": {
2626
"allejo/php-vcr-sanitizer": "^1.1",
2727
"php-coveralls/php-coveralls": "^2.7",
28-
"php-vcr/php-vcr": "^1.8",
28+
"php-vcr/php-vcr": "^1.8.2",
2929
"phpunit/phpunit": "^10",
3030
"squizlabs/php_codesniffer": "^3.11",
3131
"roave/security-advisories": "dev-latest",

0 commit comments

Comments
 (0)