Просмотр исходного кода

Merge branch '2.2' into 2.11

# Conflicts:
#	circle.yml
Dariusz Ruminski 7 лет назад
Родитель
Сommit
1d66340297
1 измененных файлов с 3 добавлено и 5 удалено
  1. 3 5
      circle.yml

+ 3 - 5
circle.yml

@@ -12,14 +12,12 @@ dependencies:
         - ~/Library/Caches/Homebrew
     pre:
         - brew update
-        - brew tap homebrew/homebrew-php
-        - brew install php71
-        - mkdir $(brew --prefix)/etc/php/7.1/conf.d
-        - echo "memory_limit = 512M" > $(brew --prefix)/etc/php/7.1/conf.d/memory.ini
+        - brew install php72
+        - echo "memory_limit = 512M" > $(brew --prefix)/etc/php/7.2/conf.d/memory.ini
         - curl -sS https://getcomposer.org/installer | php
         - php composer.phar global show hirak/prestissimo -q || php composer.phar global require --no-interaction --no-progress --optimize-autoloader hirak/prestissimo
     override:
-        - php composer.phar install --no-interaction --no-progress
+        - php composer.phar install --no-interaction --no-progress --no-suggest
 
 test:
     override: