Skip to content

Commit b369d7d

Browse files
authored
Merge pull request #25023 from protocolbuffers/php_platform_ignore_33.x
Don't ignore platform requirements
2 parents c09c3c1 + aeedbc6 commit b369d7d

File tree

1 file changed

+2
-21
lines changed

1 file changed

+2
-21
lines changed

.github/workflows/test_php.yml

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,6 @@ jobs:
6161
uses: protocolbuffers/protobuf-ci/checkout@v4
6262
with:
6363
ref: ${{ inputs.safe-checkout }}
64-
- name: Setup composer
65-
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
66-
uses: protocolbuffers/protobuf-ci/composer-setup@v4
67-
with:
68-
cache-prefix: php-${{ matrix.version-short }}
69-
directory: php
7064
- name: Run tests
7165
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
7266
uses: protocolbuffers/protobuf-ci/bazel-docker@v4
@@ -125,13 +119,6 @@ jobs:
125119
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
126120
architecture: linux-i386
127121

128-
- name: Setup composer
129-
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
130-
uses: protocolbuffers/protobuf-ci/composer-setup@v4
131-
with:
132-
cache-prefix: php-${{ matrix.version }}
133-
directory: php
134-
135122
- name: Run tests
136123
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
137124
uses: protocolbuffers/protobuf-ci/docker@v4
@@ -144,7 +131,7 @@ jobs:
144131
/bin/bash -cex '
145132
PATH="/usr/local/php-${{ matrix.version }}${{matrix.suffix}}/bin:$PATH";
146133
cd php && php -v && php -m;
147-
composer update --ignore-platform-reqs;
134+
composer update;
148135
composer ${{ matrix.test }}'
149136
150137
linux-aarch64:
@@ -164,12 +151,6 @@ jobs:
164151
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
165152
architecture: linux-aarch64
166153

167-
- name: Setup composer
168-
uses: protocolbuffers/protobuf-ci/composer-setup@v4
169-
with:
170-
cache-prefix: php-8.1
171-
directory: php
172-
173154
- name: Run tests
174155
uses: protocolbuffers/protobuf-ci/docker@v4
175156
with:
@@ -180,7 +161,7 @@ jobs:
180161
command: >-
181162
-cex '
182163
cd php;
183-
composer update --ignore-platform-reqs;
164+
composer update;
184165
composer test;
185166
composer test_c'
186167

0 commit comments

Comments
 (0)