Skip to content

Commit 46f4f94

Browse files
committed
Move to actual version
1 parent c9ba5c3 commit 46f4f94

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

.github/workflows/reusable-CI-workflow.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ jobs:
6262
php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
6363
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-max }}'
6464
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
65-
# Fix - yoanm/* - TODO - !! REVERT THIS BEFORE MERGE !! (once an actual version is available)
66-
pkg-extra-constraints: --with 'behat/gherkin:~4.12.0' --with 'yoanm/symfony-jsonrpc-http-server-doc:dev-feature/increase-supported-versions-sf7.0' --with 'yoanm/symfony-jsonrpc-http-server:dev-feature/increase-supported-versions-sf7.0'
65+
pkg-extra-constraints: --with 'behat/gherkin:~4.12.0'
6766
- job-name: Up to date versions - Sf 6.4 case
6867
php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
6968
symfony-version: '6.4'
@@ -80,8 +79,6 @@ jobs:
8079
# Fix - Sf 7.0 require php 8.1 minimum, most of deps require 8.2 !
8180
php-version: ${{ ( needs.fetch-supported-versions.outputs.symfony-max == '7.0' && needs.fetch-supported-versions.outputs.php-min == '8.0' ) && '8.2' || needs.fetch-supported-versions.outputs.php-min }}
8281
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-max }}'
83-
# Fix - yoanm/* - TODO - !! REVERT THIS BEFORE MERGE !! (once an actual version is available)
84-
pkg-extra-constraints: --with 'yoanm/symfony-jsonrpc-http-server-doc:dev-feature/increase-supported-versions-sf7.0' --with 'yoanm/symfony-jsonrpc-http-server:dev-feature/increase-supported-versions-sf7.0'
8582
- job-name: Late Symfony migration # => Lowest symfony version with highest php version allowed by composer config
8683
php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
8784
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-min }}'
@@ -219,7 +216,6 @@ jobs:
219216
--with "symfony/config:${SF_CONSTRAINT}" \
220217
--with "symfony/dependency-injection:${SF_CONSTRAINT}" \
221218
--with "symfony/http-kernel:${SF_CONSTRAINT}" \
222-
--with 'yoanm/symfony-jsonrpc-http-server-doc:dev-feature/increase-supported-versions-sf7.0' --with 'yoanm/symfony-jsonrpc-http-server:dev-feature/increase-supported-versions-sf7.0' \
223219
&& make build
224220
225221
- name: ComposerRequireChecker
@@ -247,29 +243,25 @@ jobs:
247243
php-version: ${{ needs.fetch-supported-versions.outputs.php-next }}
248244
symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-max }}
249245
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
250-
# Fix - yoanm/* - TODO - !! REVERT THIS BEFORE MERGE !! (once an actual version is available)
251-
pkg-extra-constraints: behat/gherkin:~4.12.0 yoanm/symfony-jsonrpc-http-server-doc:dev-feature/increase-supported-versions-sf7.0 yoanm/symfony-jsonrpc-http-server:dev-feature/increase-supported-versions-sf7.0
246+
pkg-extra-constraints: behat/gherkin:~4.12.0
252247
- job-name: PHP with lowest supported Symfony versions
253248
php-version: ${{ needs.fetch-supported-versions.outputs.php-next }}
254249
symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-min }}
255250
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
256251
# Fix - symfony/yaml => Avoid issue between symfony/yaml and symfony/framework-bundle (not compatible with some versions due to incomplete function signatures)
257-
# Fix - yoanm/* - TODO - !! REVERT THIS BEFORE MERGE !! (once an actual version is available)
258-
pkg-extra-constraints: behat/gherkin:~4.12.0 yoanm/symfony-jsonrpc-http-server-doc:dev-feature/increase-supported-versions-sf7.0 yoanm/symfony-jsonrpc-http-server:dev-feature/increase-supported-versions-sf7.0 ${{ ( needs.fetch-supported-versions.outputs.symfony-min == '5.4' && needs.fetch-supported-versions.outputs.php-next == '8.5' ) && 'symfony/yaml:~6.4.0' || '' }}
252+
pkg-extra-constraints: behat/gherkin:~4.12.0 ${{ ( needs.fetch-supported-versions.outputs.symfony-min == '5.4' && needs.fetch-supported-versions.outputs.php-next == '8.5' ) && 'symfony/yaml:~6.4.0' || '' }}
259253
- job-name: Symfony with highest supported PHP version
260254
php-version: ${{ needs.fetch-supported-versions.outputs.php-max }}
261255
symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-next }}
262256
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
263257
# Fix - symfony/yaml => Avoid issue between symfony/yaml and symfony/framework-bundle (not compatible with some versions due to incomplete function signatures)
264-
# Fix - yoanm/* - TODO - !! REVERT THIS BEFORE MERGE !! (once an actual version is available)
265-
pkg-extra-constraints: behat/gherkin:~4.12.0 yoanm/symfony-jsonrpc-http-server-doc:dev-feature/increase-supported-versions-sf7.0 yoanm/symfony-jsonrpc-http-server:dev-feature/increase-supported-versions-sf7.0
258+
pkg-extra-constraints: behat/gherkin:~4.12.0
266259
- job-name: Symfony with lowest supported PHP version
267260
# Fix - Sf 7.1 require php 8.2 minimum !
268261
php-version: ${{ ( needs.fetch-supported-versions.outputs.symfony-next == '7.1' && needs.fetch-supported-versions.outputs.php-min == '8.0' ) && '8.2' || needs.fetch-supported-versions.outputs.php-min }}
269262
symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-next }}
270263
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
271-
# Fix - yoanm/* - TODO - !! REVERT THIS BEFORE MERGE !! (once an actual version is available)
272-
pkg-extra-constraints: behat/gherkin:~4.12.0 yoanm/symfony-jsonrpc-http-server-doc:dev-feature/increase-supported-versions-sf7.0 yoanm/symfony-jsonrpc-http-server:dev-feature/increase-supported-versions-sf7.0
264+
pkg-extra-constraints: behat/gherkin:~4.12.0
273265

274266
steps:
275267
- name: Check out code

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"symfony/http-kernel": "^5.4 || ^6.4 || ^7.0",
3737
"yoanm/jsonrpc-http-server-swagger-doc-sdk": "^v1.0",
3838
"yoanm/jsonrpc-server-doc-sdk": "^v1.0",
39-
"yoanm/symfony-jsonrpc-http-server-doc": "^1.1 || dev-feature/increase-supported-versions-sf7.0"
39+
"yoanm/symfony-jsonrpc-http-server-doc": "^1.1 || ^2.0"
4040
},
4141
"require-dev": {
4242
"behat/behat": "^3.9.0,<=3.16.1",

0 commit comments

Comments
 (0)