Skip to content

Commit

Permalink
Merge branch '1.1'
Browse files Browse the repository at this point in the history
* 1.1:
  Try to remove custom Node installation
  Replace TRAVIS_NODE_VERSION with NODE_VERSION
  Exclude the web/media directory from firewall restrict list.
  • Loading branch information
pamil committed Dec 28, 2017
2 parents a1b00ed + b64fa32 commit 69b1ca3
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 8 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Expand Up @@ -15,7 +15,6 @@ matrix:
php: 7.1
env:
- SYLIUS_SUITE="application"
- TRAVIS_NODE_VERSION="6.11"
services:
- memcached
-
Expand All @@ -29,7 +28,6 @@ matrix:
php: 7.2
env:
- SYLIUS_SUITE="application"
- TRAVIS_NODE_VERSION="6.11"
services:
- memcached
-
Expand Down
2 changes: 1 addition & 1 deletion app/config/security.yml
Expand Up @@ -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:
Expand Down
5 changes: 0 additions & 5 deletions etc/travis/suites/application/before_install.sh
Expand Up @@ -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 $?

0 comments on commit 69b1ca3

Please sign in to comment.