@@ -42,11 +42,14 @@ jobs:
4242 uses : protocolbuffers/protobuf-ci/checkout@v2
4343 with :
4444 ref : ${{ inputs.safe-checkout }}
45+ <<<<<<< HEAD
4546 - name : Setup composer
4647 uses : protocolbuffers/protobuf-ci/composer-setup@v2
4748 with :
4849 cache-prefix : php-${{ matrix.version-short }}
4950 directory : php
51+ =======
52+ >>>>>>> 9d60ddf81 (Don't ignore platform requirements)
5053 - name : Run tests
5154 uses : protocolbuffers/protobuf-ci/docker@v2
5255 with :
@@ -89,12 +92,15 @@ jobs:
8992 credentials : ${{ secrets.GAR_SERVICE_ACCOUNT }}
9093 architecture : linux-i386
9194
95+ <<<<<<< HEAD
9296 - name : Setup composer
9397 uses : protocolbuffers/protobuf-ci/composer-setup@v2
9498 with :
9599 cache-prefix : php-${{ matrix.version }}
96100 directory : php
97101
102+ =======
103+ >>>>>>> 9d60ddf81 (Don't ignore platform requirements)
98104 - name : Run tests
99105 uses : protocolbuffers/protobuf-ci/docker@v2
100106 with :
@@ -106,7 +112,7 @@ jobs:
106112 /bin/bash -cex '
107113 PATH="/usr/local/php-${{ matrix.version }}${{matrix.suffix}}/bin:$PATH";
108114 cd php && php -v && php -m;
109- composer update --ignore-platform-reqs ;
115+ composer update;
110116 composer ${{ matrix.test }}'
111117
112118 linux-aarch64 :
@@ -126,12 +132,15 @@ jobs:
126132 credentials : ${{ secrets.GAR_SERVICE_ACCOUNT }}
127133 architecture : linux-aarch64
128134
135+ <<<<<<< HEAD
129136 - name : Setup composer
130137 uses : protocolbuffers/protobuf-ci/composer-setup@v2
131138 with :
132139 cache-prefix : php-8.0
133140 directory : php
134141
142+ =======
143+ >>>>>>> 9d60ddf81 (Don't ignore platform requirements)
135144 - name : Run tests
136145 uses : protocolbuffers/protobuf-ci/docker@v2
137146 with :
@@ -142,7 +151,7 @@ jobs:
142151 command : >-
143152 -c '
144153 cd php;
145- composer update --ignore-platform-reqs ;
154+ composer update;
146155 composer test;
147156 composer test_c'
148157
0 commit comments