Skip to content

Commit 3c8a3d2

Browse files
zhangskzcopybara-github
authored andcommitted
Raise minimum PHP version to 8.1, due to PHP 8.0 EOL per https://cloud.google.com/php/getting-started/supported-php-versions
Drops tests for PHP 8.0, and adds tests for PHP 8.3. See https://www.php.net/supported-versions.php. PiperOrigin-RevId: 599636473
1 parent 57f770f commit 3c8a3d2

File tree

4 files changed

+23
-19
lines changed

4 files changed

+23
-19
lines changed

.github/workflows/test_php.yml

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,27 @@ jobs:
1717
fail-fast: false # Don't cancel all jobs if one fails.
1818
matrix:
1919
include:
20-
- name: 8.0 Optimized
21-
version: "8.0.5"
22-
version-short: "8.0"
20+
- name: 8.1 Optimized
21+
version: "8.1.14"
22+
version-short: "8.1"
2323
command: composer test \&\& composer test_c
24-
- name: 8.0 Debug
25-
version: 8.0.5-dbg
26-
version-short: "8.0"
24+
- name: 8.1 Debug
25+
version: 8.1.14-dbg
26+
version-short: "8.1"
2727
command: composer test \&\& composer test_c
28-
- name: 8.0 Memory Leak
29-
version: 8.0.5-dbg
30-
version-short: "8.0"
28+
- name: 8.1 Memory Leak
29+
version: 8.1.14-dbg
30+
version-short: "8.1"
3131
# Run specialized memory leak & multirequest tests.
3232
command: composer test_c \&\& tests/multirequest.sh \&\& tests/memory_leak_test.sh
33-
- name: 8.0 Valgrind
34-
version: 8.0.5-dbg
35-
version-short: "8.0"
33+
- name: 8.1 Valgrind
34+
version: 8.1.14-dbg
35+
version-short: "8.1"
3636
command: composer test_valgrind
37+
- name: 8.3 Optimized
38+
version: "8.3.1"
39+
version-short: "8.3"
40+
command: composer test \&\& composer test_c
3741

3842
name: Linux ${{ matrix.name}}
3943
runs-on: ubuntu-latest
@@ -59,7 +63,7 @@ jobs:
5963
strategy:
6064
fail-fast: false # Don't cancel all jobs if one fails.
6165
matrix:
62-
version: ['8.0']
66+
version: ['8.1']
6367
suffix: [ '', '-zts']
6468
test: ['test', 'test_c']
6569
exclude:
@@ -74,7 +78,7 @@ jobs:
7478
name: Linux 32-bit ${{ matrix.version}}${{ matrix.suffix_name }}${{ matrix.test_name }}
7579
runs-on: ubuntu-latest
7680
env:
77-
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/32bit@sha256:8275360dc5d676f3470872d79087901c0e4153453976bea908a92c82e8d209ea
81+
image: us-docker.pkg.dev/protobuf-build/containers/test/linux/32bit@sha256:836f2cedcfe351d9a30055076630408e61994fc7d783e8333a99570968990eeb
7882
steps:
7983
- name: Checkout pending changes
8084
uses: protocolbuffers/protobuf-ci/checkout@v2
@@ -129,7 +133,7 @@ jobs:
129133
- name: Setup composer
130134
uses: protocolbuffers/protobuf-ci/composer-setup@v2
131135
with:
132-
cache-prefix: php-8.0
136+
cache-prefix: php-8.1
133137
directory: php
134138

135139
- name: Run tests
@@ -150,7 +154,7 @@ jobs:
150154
strategy:
151155
fail-fast: false # Don't cancel all jobs if one fails.
152156
matrix:
153-
version: ['8.2']
157+
version: ['8.2', '8.3']
154158

155159
name: MacOS PHP ${{ matrix.version }}
156160
runs-on: macos-12

.github/workflows/test_php_ext.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
strategy:
4242
fail-fast: false # Don't cancel all jobs if one fails.
4343
matrix:
44-
version: ["8.0", "8.1", "8.2"]
44+
version: ["8.1", "8.2", "8.3"]
4545
name: Build ${{ matrix.version }}
4646
runs-on: ubuntu-latest
4747
steps:

php/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"homepage": "https://developers.google.com/protocol-buffers/",
77
"license": "BSD-3-Clause",
88
"require": {
9-
"php": ">=8.0.0"
9+
"php": ">=8.1.0"
1010
},
1111
"provide": {
1212
"ext-protobuf": "*"

php/ext/google/protobuf/template_package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependencies>
3131
<required>
3232
<php>
33-
<min>8.0.0</min>
33+
<min>8.1.0</min>
3434
</php>
3535
<pearinstaller>
3636
<min>1.4.0</min>

0 commit comments

Comments
 (0)