Skip to content

Commit f558ae5

Browse files
committed
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4: [skip ci] Fix Symfony PHP requirements in community build
2 parents 1ff90c4 + b4eea9c commit f558ae5

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
@@ -587,9 +587,9 @@ jobs:
587587
exit 1
588588
fi
589589
- name: Test Symfony
590-
if: ${{ !cancelled() && !inputs.skip_symfony }}
590+
if: ${{ !cancelled() && inputs.symfony_version != '' }}
591591
run: |
592-
git clone https://github.com/symfony/symfony.git --depth=1
592+
git clone https://github.com/symfony/symfony.git --depth=1 --branch="${{ inputs.symfony_version }}"
593593
cd symfony
594594
git rev-parse HEAD
595595
php /usr/bin/composer install --no-progress --ignore-platform-req=php+
@@ -623,7 +623,8 @@ jobs:
623623
exit 1
624624
fi
625625
- name: 'Symfony Preloading'
626-
if: ${{ !cancelled() && !inputs.skip_symfony }}
626+
# composer create-project will automatically pick the right Symfony version for us.
627+
if: ${{ !cancelled() && inputs.symfony_version != '' }}
627628
run: |
628629
php /usr/bin/composer create-project symfony/symfony-demo symfony_demo --no-progress --ignore-platform-req=php+
629630
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)