Skip to content

Commit

Permalink
Replace zendsearch with handcraftedinthealps fork (#204)
Browse files Browse the repository at this point in the history
* Replace zendsearch with handcraftedinthealps fork

* Allow massive build 0.4

* Upgrade handcraftedinthealps/zendsearch to ^2.0
  • Loading branch information
alexander-schranz authored and danrot committed Dec 17, 2019
1 parent e4fad55 commit 602aaec
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
10 changes: 10 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
sudo: false

dist: trusty
language: php

cache:
Expand All @@ -11,6 +12,7 @@ matrix:
- php: 5.5
env:
- COMPOSER_FLAGS="--prefer-dist --no-interaction"
- ENABLE_SWAP=true
- php: 7.1
env:
- COMPOSER_FLAGS="--prefer-dist --no-interaction"
Expand All @@ -20,6 +22,14 @@ before_install:
- phpenv config-add tests/travis.php.ini

install:
- | # enable swap
if [[ $ENABLE_SWAP == 'true' ]]; then
sudo fallocate -l 4G /swapfile
sudo chmod 600 /swapfile
sudo mkswap /swapfile
sudo swapon /swapfile
sudo sysctl vm.swappiness=10
fi
# Install dependencies
- travis_retry composer update $COMPOSER_FLAGS
- composer info -i
Expand Down
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@
"incenteev/composer-parameter-handler": "~2.1",
"sulu/sulu": "~1.6.22",
"dantleech/phpcr-migrations-bundle": "~1.0",
"zendframework/zend-stdlib": "^2.3",
"zendframework/zendsearch": "@dev",
"massive/build-bundle": "0.3.*",
"handcraftedinthealps/zendsearch": "^2.0",
"massive/build-bundle": "^0.3 || ^0.4",
"jackalope/jackalope-doctrine-dbal": "^1.2.5",
"jackalope/jackalope-jackrabbit": "^1.2",
"doctrine/doctrine-fixtures-bundle": "~2.3",
Expand Down
2 changes: 1 addition & 1 deletion tests/travis.php.ini
Original file line number Diff line number Diff line change
@@ -1 +1 @@
memory_limit = 4096M
memory_limit = -1

0 comments on commit 602aaec

Please sign in to comment.