Skip to content

Don't ignore platform requirements #25025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rgoldfinger6 merged 7 commits into from
Dec 24, 2025
Merged

Don't ignore platform requirements #25025

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a53de52
Don't ignore platform requirements
mkruskal-google Dec 23, 2025
b7abd06
fix merge conflict annotations
Dec 23, 2025
56f2fd2
disable php tests
Dec 23, 2025
2e1a0cc
Update GitHub Actions to use macOS-14.
ericsalo Nov 22, 2025
3c282a4
Update GitHub Actions to use macOS-14 (again).
ericsalo Nov 24, 2025
1d18bbd
protobuf: update php from macos-13 to macos-15-intel
ericsalo Dec 9, 2025
9717aac
change setup-ruby and add new xcode version to build
Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .github/workflows/test_php.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,14 @@ jobs:
uses: protocolbuffers/protobuf-ci/checkout@v2
with:
ref: ${{ inputs.safe-checkout }}
<<<<<<< HEAD
- name: Setup composer
uses: protocolbuffers/protobuf-ci/composer-setup@v2
with:
cache-prefix: php-${{ matrix.version-short }}
directory: php
=======
>>>>>>> 9d60ddf81 (Don't ignore platform requirements)
- name: Run tests
uses: protocolbuffers/protobuf-ci/docker@v2
with:
Expand Down Expand Up @@ -89,12 +92,15 @@ jobs:
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
architecture: linux-i386

<<<<<<< HEAD
- name: Setup composer
uses: protocolbuffers/protobuf-ci/composer-setup@v2
with:
cache-prefix: php-${{ matrix.version }}
directory: php

=======
>>>>>>> 9d60ddf81 (Don't ignore platform requirements)
- name: Run tests
uses: protocolbuffers/protobuf-ci/docker@v2
with:
Expand All @@ -106,7 +112,7 @@ jobs:
/bin/bash -cex '
PATH="/usr/local/php-${{ matrix.version }}${{matrix.suffix}}/bin:$PATH";
cd php && php -v && php -m;
composer update --ignore-platform-reqs;
composer update;
composer ${{ matrix.test }}'

linux-aarch64:
Expand All @@ -126,12 +132,15 @@ jobs:
credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
architecture: linux-aarch64

<<<<<<< HEAD
- name: Setup composer
uses: protocolbuffers/protobuf-ci/composer-setup@v2
with:
cache-prefix: php-8.0
directory: php

=======
>>>>>>> 9d60ddf81 (Don't ignore platform requirements)
- name: Run tests
uses: protocolbuffers/protobuf-ci/docker@v2
with:
Expand All @@ -142,7 +151,7 @@ jobs:
command: >-
-c '
cd php;
composer update --ignore-platform-reqs;
composer update;
composer test;
composer test_c'

Expand Down