Skip to content

Commit d0be0f5

Browse files
authored
Merge pull request doctrine#2010 from greg0ire/3.0.x
Merge 2.17.x up into 3.0.x
2 parents 867f3f6 + 2aa527b commit d0be0f5

2 files changed

Lines changed: 15 additions & 1 deletion

File tree

.github/workflows/continuous-integration.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ jobs:
4646
- ""
4747
remove-orm:
4848
- false
49+
remove-doctrine-messenger:
50+
- false
4951
include:
5052
# Tests the lowest set of dependencies
5153
- dependencies: "lowest"
@@ -63,6 +65,12 @@ jobs:
6365
stability: "stable"
6466
remove-orm: true
6567

68+
# No Messenger integration
69+
- php-version: "8.4"
70+
dependencies: "highest"
71+
stability: "stable"
72+
remove-doctrine-messenger: true
73+
6674
# Bleeding edge
6775
- php-version: "8.4"
6876
dependencies: "highest"
@@ -91,6 +99,10 @@ jobs:
9199
run: "composer remove doctrine/orm --dev --no-update"
92100
if: "${{ matrix.remove-orm }}"
93101

102+
- name: "Remove symfony/doctrine-messenger"
103+
run: "composer remove symfony/doctrine-messenger --dev --no-update"
104+
if: "${{ matrix.remove-doctrine-messenger }}"
105+
94106
- name: "Install dependencies with Composer"
95107
uses: "ramsey/composer-install@v3"
96108
with:
@@ -109,6 +121,8 @@ jobs:
109121
upload_coverage:
110122
name: "Upload coverage to Codecov"
111123
runs-on: "ubuntu-latest"
124+
# Only run on PRs from forks or PRs from branches that do not match `*.x`
125+
if: "github.event.pull_request.head.repo.full_name != github.repository || !contains(github.event.pull_request.head.ref, '.x')"
112126
needs:
113127
- "phpunit"
114128

.github/workflows/website-schema.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ on:
1818
jobs:
1919
json-validate:
2020
name: "Validate JSON schema"
21-
uses: "doctrine/.github/.github/workflows/website-schema.yml@7.1.0"
21+
uses: "doctrine/.github/.github/workflows/website-schema.yml@7.3.0"

0 commit comments

Comments
 (0)