Skip to content

Commit

Permalink
Merge ezplatform/master into master
Browse files Browse the repository at this point in the history
  • Loading branch information
damianz5 committed Sep 17, 2018
2 parents 9ca788f + 7fc0616 commit 58169ed
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 1 deletion.
7 changes: 7 additions & 0 deletions app/config/cache_pool/cache.memcached.yml
Expand Up @@ -8,3 +8,10 @@ services:
# Example from vendor/symfony/symfony/src/Symfony/Component/Cache/Traits/MemcachedTrait.php:
# memcached://user:pass@localhost?weight=33'
provider: 'memcached://%cache_dsn%'
# Cache namespace prefix overriding the one used by Symfony globally
# This makes sure cache is reliably shared across whole cluster and all Symfony env's
# Can be used for blue/green deployment strategies when changes affect content cache.
# For multi db setup adapt this to be unique per pool (one pool per database)
# If you prefer default behaviour set this to null or comment out, and consider for instance:
# https://symfony.com/doc/current/reference/configuration/framework.html#prefix-seed
namespace: '%cache_namespace%'
7 changes: 7 additions & 0 deletions app/config/cache_pool/cache.redis.yml
Expand Up @@ -10,3 +10,10 @@ services:
# redis://secret@example.com:1234/13
# redis://secret@/var/run/redis.sock/13?persistent_id=4&class=Redis&timeout=3&retry_interval=3
provider: 'redis://%cache_dsn%'
# Cache namespace prefix overriding the one used by Symfony by default
# This makes sure cache is reliably shared across whole cluster and all Symfony env's
# Can be used for blue/green deployment strategies when changes affect content cache.
# For multi db setup adapt this to be unique per pool (one pool per database)
# If you prefer default behaviour set this to null or comment out, and consider for instance:
# https://symfony.com/doc/current/reference/configuration/framework.html#prefix-seed
namespace: '%cache_namespace%'
6 changes: 6 additions & 0 deletions app/config/default_parameters.yml
Expand Up @@ -35,6 +35,10 @@ parameters:

# Cache DSN, see app/config/services/cache.yml for examples:
cache_dsn: '%env(CACHE_DSN)%'

# Cache namespace prefix for use with Redis/Memcached, 'ez' by default.
# For further info incl alternatives for "blue/green deployment" and multi repo installs, see: app/config/cache_pool/*.yml
cache_namespace: '%env(CACHE_NAMESPACE)%'

# Settings for HttpCache
purge_server: '%env(HTTPCACHE_PURGE_SERVER)%'
Expand Down Expand Up @@ -68,6 +72,8 @@ parameters:

env(CACHE_DSN): localhost

env(CACHE_NAMESPACE): ez

env(HTTPCACHE_PURGE_SERVER): "http://localhost:80"

env(HTTPCACHE_DEFAULT_TTL): 86400
Expand Down
5 changes: 4 additions & 1 deletion bin/.travis/trusty/setup_ezplatform.sh
Expand Up @@ -64,9 +64,12 @@ if [[ -n "${DEPENDENCY_PACKAGE_NAME}" ]]; then
BASE_PACKAGE_NAME=`basename ${DEPENDENCY_PACKAGE_NAME}`
echo "> Move ${DEPENDENCY_PACKAGE_DIR} to ${EZPLATFORM_BUILD_DIR}/${BASE_PACKAGE_NAME}"
mv ${DEPENDENCY_PACKAGE_DIR} ${EZPLATFORM_BUILD_DIR}/${BASE_PACKAGE_NAME}
cd ${EZPLATFORM_BUILD_DIR}/${BASE_PACKAGE_NAME}

# perform full checkout to allow using as local Composer depenency
git fetch --unshallow

echo "> Create temporary branch in ${DEPENDENCY_PACKAGE_NAME}"
cd ${EZPLATFORM_BUILD_DIR}/${BASE_PACKAGE_NAME}
# reuse HEAD commit id for better knowledge about what got checked out
TMP_TRAVIS_BRANCH=tmp_`git rev-parse --short HEAD`
git checkout -b ${TMP_TRAVIS_BRANCH}
Expand Down

0 comments on commit 58169ed

Please sign in to comment.