Skip to content

Commit 462c850

Browse files
authored
Merge pull request #1134 from lcobucci/5.6.x-merge-up-into-6.0.x_lG2Fb07X
Merge release 5.6.0 into 6.0.x
2 parents 97d79a6 + 8c3c0f0 commit 462c850

File tree

4 files changed

+243
-234
lines changed

4 files changed

+243
-234
lines changed

.github/workflows/backwards-compatibility.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ jobs:
3434
path: ${{ steps.composer-cache.outputs.composer_cache_dir }}
3535
key: "php-8.3-bc-break-check-${{ hashFiles('.github/workflows/backwards-compatibility.yml') }}"
3636
restore-keys: "php-8.3-bc-break-check-"
37-
3837
- name: "Install dependencies"
3938
run: composer global require roave/backward-compatibility-check
4039

.github/workflows/phpunit.yml

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -19,39 +19,6 @@ jobs:
1919
php-version:
2020
- "8.3"
2121
- "8.4"
22-
operating-system:
23-
- "ubuntu-latest"
24-
25-
steps:
26-
- name: "Checkout"
27-
uses: "actions/checkout@v6.0.1"
28-
29-
- name: "Install PHP"
30-
uses: "shivammathur/setup-php@2.36.0"
31-
with:
32-
coverage: "none"
33-
php-version: "${{ matrix.php-version }}"
34-
ini-values: memory_limit=-1
35-
tools: composer:v2, cs2pr
36-
37-
- name: "Install dependencies"
38-
uses: "ramsey/composer-install@3.1.1"
39-
with:
40-
dependency-versions: "${{ matrix.dependencies }}"
41-
42-
- name: "Tests"
43-
run: "make phpunit"
44-
45-
phpunit-rc:
46-
name: "PHPUnit tests (nightly)"
47-
48-
runs-on: ${{ matrix.operating-system }}
49-
50-
strategy:
51-
matrix:
52-
dependencies:
53-
- "locked"
54-
php-version:
5522
- "8.5"
5623
operating-system:
5724
- "ubuntu-latest"
@@ -72,7 +39,6 @@ jobs:
7239
uses: "ramsey/composer-install@3.1.1"
7340
with:
7441
dependency-versions: "${{ matrix.dependencies }}"
75-
composer-options: " --ignore-platform-req=php"
7642

7743
- name: "Tests"
7844
run: "make phpunit"

0 commit comments

Comments
 (0)