Skip to content

Commit 9efd7dd

Browse files
committed
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4: Fix Laravel build on community job
2 parents c72957b + 217b9e7 commit 9efd7dd

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

azure/community_job.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,7 @@ jobs:
5151
- script: |
5252
git clone https://github.com/laravel/framework.git --branch=master --depth=1
5353
cd framework
54-
#php7.3 /usr/bin/composer require "doctrine/dbal:^3.0" --no-interaction
55-
php7.3 /usr/bin/composer install --no-progress
56-
# Hack to disable a test that hangs on azure
57-
sed -i 's/PHP_OS/"Darwin"/' tests/Filesystem/FilesystemTest.php
54+
php7.4 /usr/bin/composer install --no-progress
5855
export USE_ZEND_ALLOC=0
5956
export ASAN_OPTIONS=exitcode=139
6057
php vendor/bin/phpunit
@@ -65,8 +62,8 @@ jobs:
6562
- script: |
6663
git clone https://github.com/symfony/symfony.git --depth=1
6764
cd symfony
68-
php7.3 /usr/bin/composer install --no-progress
69-
php7.3 ./phpunit install
65+
php7.4 /usr/bin/composer install --no-progress
66+
php7.4 ./phpunit install
7067
export USE_ZEND_ALLOC=0
7168
export USE_TRACKED_ALLOC=1
7269
export ASAN_OPTIONS=exitcode=139
@@ -96,14 +93,14 @@ jobs:
9693
export USE_ZEND_ALLOC=0
9794
export USE_TRACKED_ALLOC=1
9895
export ASAN_OPTIONS=exitcode=139
99-
php7.3 /usr/bin/composer install --no-progress
96+
php7.4 /usr/bin/composer install --no-progress
10097
php ./phpunit
10198
if [ $? -gt 128 ]; then
10299
exit 1
103100
fi
104101
displayName: 'Test PHPUnit'
105102
- script: |
106-
php7.3 /usr/bin/composer create-project symfony/symfony-demo symfony_demo --no-progress
103+
php7.4 /usr/bin/composer create-project symfony/symfony-demo symfony_demo --no-progress
107104
cd symfony_demo
108105
export USE_ZEND_ALLOC=0
109106
export USE_TRACKED_ALLOC=1

0 commit comments

Comments
 (0)