Merge branch '1.0' into 1.1

* 1.0:
  Try to remove custom Node installation
  Replace TRAVIS_NODE_VERSION with NODE_VERSION
  Exclude the web/media directory from firewall restrict list.
This commit is contained in:
Kamil Kokot 2017-12-28 09:28:25 +01:00
commit b64fa32607
No known key found for this signature in database
GPG key ID: 7BD76F7054D93C89
3 changed files with 1 additions and 8 deletions

View file

@ -15,7 +15,6 @@ matrix:
php: 7.1
env:
- SYLIUS_SUITE="application"
- TRAVIS_NODE_VERSION="6.11"
services:
- memcached
-
@ -29,7 +28,6 @@ matrix:
php: 7.2
env:
- SYLIUS_SUITE="application"
- TRAVIS_NODE_VERSION="6.11"
services:
- memcached
-

View file

@ -4,7 +4,7 @@
parameters:
sylius.security.admin_regex: "^/admin"
sylius.security.api_regex: "^/api"
sylius.security.shop_regex: "^/(?!admin|api/.*|api$)[^/]++"
sylius.security.shop_regex: "^/(?!admin|api/.*|api$|media/.*)[^/]++"
security:
providers:

View file

@ -5,8 +5,3 @@ source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/../../../bash/application.
print_header "Activating memcached extension" "Sylius"
run_command "echo \"extension = memcached.so\" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini" || exit $?
print_header "Installing Yarn" "Sylius"
# Install Node Version Manager to install newer node version
run_command "rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout \`git describe --abbrev=0 --tags\`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION" || exit $?