Skip to content

Commit 87743f6

Browse files
mkruskal-googleRachel Goldfinger
authored andcommitted
Don't ignore platform requirements
This locks new non-hermetic versions of dependencies that don't work. In this case, webmozart/assert was upgraded from 1.12.1 to 2.0.0 PiperOrigin-RevId: 848269028
1 parent 91ca9e3 commit 87743f6

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
@@ -62,12 +62,6 @@ jobs:
6262
uses: protocolbuffers/protobuf-ci/checkout@v4
6363
with:
6464
ref: ${{ inputs.safe-checkout }}
65-
- name: Setup composer
66-
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
67-
uses: protocolbuffers/protobuf-ci/composer-setup@v4
68-
with:
69-
cache-prefix: php-${{ matrix.version-short }}
70-
directory: php
7165
- name: Run tests
7266
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
7367
uses: protocolbuffers/protobuf-ci/docker@v4
@@ -117,13 +111,6 @@ jobs:
117111
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
118112
architecture: linux-i386
119113

120-
- name: Setup composer
121-
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
122-
uses: protocolbuffers/protobuf-ci/composer-setup@v4
123-
with:
124-
cache-prefix: php-${{ matrix.version }}
125-
directory: php
126-
127114
- name: Run tests
128115
if: ${{ !matrix.continuous-only || inputs.continuous-run }}
129116
uses: protocolbuffers/protobuf-ci/docker@v4
@@ -136,7 +123,7 @@ jobs:
136123
/bin/bash -cex '
137124
PATH="/usr/local/php-${{ matrix.version }}${{matrix.suffix}}/bin:$PATH";
138125
cd php && php -v && php -m;
139-
composer update --ignore-platform-reqs;
126+
composer update;
140127
composer ${{ matrix.test }}'
141128
142129
linux-aarch64:
@@ -156,12 +143,6 @@ jobs:
156143
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
157144
architecture: linux-aarch64
158145

159-
- name: Setup composer
160-
uses: protocolbuffers/protobuf-ci/composer-setup@v4
161-
with:
162-
cache-prefix: php-8.1
163-
directory: php
164-
165146
- name: Run tests
166147
uses: protocolbuffers/protobuf-ci/docker@v4
167148
with:
@@ -172,7 +153,7 @@ jobs:
172153
command: >-
173154
-cex '
174155
cd php;
175-
composer update --ignore-platform-reqs;
156+
composer update;
176157
composer test;
177158
composer test_c'
178159

0 commit comments

Comments
 (0)