Skip to content

Commit 24f4799

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: [skip ci] Fix Symfony PHP requirements in community build
2 parents 93ce050 + 7ceee59 commit 24f4799

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

.github/workflows/nightly.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ on:
3838
skip_laravel:
3939
required: true
4040
type: boolean
41-
skip_symfony:
41+
symfony_version:
4242
required: true
43-
type: boolean
43+
type: string
4444
skip_wordpress:
4545
required: true
4646
type: boolean
@@ -599,9 +599,9 @@ jobs:
599599
exit 1
600600
fi
601601
- name: Test Symfony
602-
if: ${{ !cancelled() && !inputs.skip_symfony }}
602+
if: ${{ !cancelled() && inputs.symfony_version != '' }}
603603
run: |
604-
git clone https://github.com/symfony/symfony.git --depth=1
604+
git clone https://github.com/symfony/symfony.git --depth=1 --branch="${{ inputs.symfony_version }}"
605605
cd symfony
606606
git rev-parse HEAD
607607
php /usr/bin/composer install --no-progress --ignore-platform-req=php+
@@ -635,7 +635,8 @@ jobs:
635635
exit 1
636636
fi
637637
- name: 'Symfony Preloading'
638-
if: ${{ !cancelled() && !inputs.skip_symfony }}
638+
# composer create-project will automatically pick the right Symfony version for us.
639+
if: ${{ !cancelled() && inputs.symfony_version != '' }}
639640
run: |
640641
php /usr/bin/composer create-project symfony/symfony-demo symfony_demo --no-progress --ignore-platform-req=php+
641642
cd symfony_demo

.github/workflows/root.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ jobs:
5757
windows_version: '2022'
5858
vs_crt_version: ${{ ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) && 'vs17') || 'vs16' }}
5959
skip_laravel: ${{ matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1 }}
60-
skip_symfony: ${{ matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1 }}
60+
symfony_version: ${{ (((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9) && '8.1')
61+
|| ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 2) && '7.4')
62+
|| '' }}
6163
skip_wordpress: ${{ matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1 }}
6264
variation_enable_zend_max_execution_timers: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 3) || matrix.branch.version[0] >= 9 }}
6365
secrets: inherit

0 commit comments

Comments
 (0)