Skip to content

Commit cc121aa

Browse files
Merge pull request #327 from sebastianfeldmann/fix-builds
Fix PHP 8.0 build, add PHP 8.1 build
2 parents b65da0c + 78edd88 commit cc121aa

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

.github/workflows/integration.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: "Integration"
33
on:
44
push:
55
branches:
6-
- "main"
6+
- "*"
77
pull_request:
88

99
jobs:
@@ -12,10 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [ubuntu-latest]
15-
php: ['7.3', '7.4', '8.0']
16-
include:
17-
- php: "8.0"
18-
composeroptions: "--ignore-platform-req=php"
15+
php: ['7.3', '7.4', '8.0', '8.1']
1916
steps:
2017
- uses: actions/checkout@master
2118

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"require-dev": {
5656
"sebastianfeldmann/git": "^3.2",
5757
"sebastianfeldmann/ftp": "^0.9",
58-
"guzzlehttp/guzzle": "^5.3.3|^6.2.1|^7.0.0",
58+
"guzzlehttp/guzzle": "^5.3.4|^6.5.8|^7.5.0",
5959
"aws/aws-sdk-php": "^3.10",
6060
"kunalvarma05/dropbox-php-sdk": "^0.2",
6161
"phpseclib/phpseclib": "^2.0",

0 commit comments

Comments
 (0)