Skip to content

Commit

Permalink
Merge pull request #320 from EasyPost/version_matrix
Browse files Browse the repository at this point in the history
chore: overhaul version matrix
  • Loading branch information
Justintime50 authored Nov 28, 2023
2 parents 59bb044 + d0e2de0 commit 6648c59
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 40 deletions.
19 changes: 9 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,24 @@ on:

jobs:
lint:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: set up PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
php-version: '8.3'
- name: install dependencies
run: make install
- name: lint
run: make lint
run-tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
strategy:
matrix:
# 8.2.9+ is needed due to segfaults on 8.2-8.2.8 when generating coverage: https://github.com/php-vcr/php-vcr/issues/373
phpversion: ['7.4', '8.0', '8.1', '8.2.9']
phpversion: ['8.0', '8.1', '8.2', '8.3']
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: set up PHP
uses: shivammathur/setup-php@v2
with:
Expand All @@ -52,14 +51,14 @@ jobs:
run: ./bin/php-coveralls --coverage_clover=build/logs/clover.xml -v
docs:
if: github.ref == 'refs/heads/master'
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
php-version: '8.3'
- name: Install Dependencies
run: make install
- name: Generate Docs
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Next Major Release

- Drops support for PHP 7.4
- Adds support for PHP 8.3
- Removed `withCarbonOffset` parameter from `create`, `buy`, and `regenerateRates` functions of the Shipment service as EasyPost now offers Carbon Neutral shipments by default for free
- Fixes a bug where the original filtering criteria of `all` calls wasn't passed along to `getNextPage` calls. Now, these are persisted via a `_params` key on response objects locally
- Removes the undocumented `createAndBuy` function from the `Batch` service. The proper usage is to create a batch first and buy it separately
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ For additional support, see our [org-wide support policy](https://github.com/Eas

## Development

**NOTE:** Recording VCR cassettes only works with PHP 7.4. Once recorded, tests can be run on PHP 7.4 or 8.0+.

```bash
# Install dependencies
make install
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
],
"require": {
"ext-json": "*",
"php": ">=7.4",
"php": ">=8.0",
"guzzlehttp/guzzle": "^7.5"
},
"require-dev": {
"allejo/php-vcr-sanitizer": "^1.0.9",
"php-coveralls/php-coveralls": "^2.5",
"php-vcr/php-vcr": "^1.5.5",
"php-vcr/php-vcr": "^1.6",
"phpunit/phpunit": "^9",
"squizlabs/php_codesniffer": "^3.7",
"roave/security-advisories": "dev-latest",
Expand Down
54 changes: 28 additions & 26 deletions test/cassettes/addresses/all.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6648c59

Please sign in to comment.