diff --git a/.travis.yml b/.travis.yml index 3edfc71ff..0b26b03c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,12 @@ php: - 5.4 - 5.5 - 5.6 -- 7 +- 7.0 - hhvm matrix: allow_failures: - - php: 7 - php: hhvm + fast_finish: true sudo: false before_script: - travis_retry composer self-update @@ -26,6 +26,4 @@ script: - if [ $(phpenv version-name) != "5.3" ]; then ./vendor/bin/codecept build; fi - if [ $(phpenv version-name) != "5.3" ]; then ./vendor/bin/codecept run -d --fail-fast --env travis; fi notifications: - slack: - secure: jpoMjtkveVuPZM4JXJETAPv8QUCtTbI/ZTixdS9HUgxSb9tD2DkoekMaRzXYnXA82Les/gGxTC0fQFcFrls6Ypkbvp1udBPggmAdLiBHubBIz+yd1BGIf/l4I6MY1QmGe1Lx4xlnVlEgLnKXHn+W+ENep4/MzpCEaR9Vw8wfGqY= - secure: "gPv4qFmGcXimNlI/OeVk5n4VtRCWbAe7VUtw7Inb3A/ZZaVDo11gtMNkwo/JVKSnXqFkaCQYebcNpj2D9Rb2ZCwgjMSX6wxvpA4/8OLOZpbWqFW6Hz2RKNggubXlnalXkIwFcsvj70rKctbcJFk2C1G9rVvYWdVGD9X4/ozQtAc=" + email: false diff --git a/README.md b/README.md index f629e1077..5f40664d1 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ -XpressEngine With XETOWN -============ +XpressEngine XETOWN Remix +========================= + develop 브랜치에서 쓸만한 PR Merge! xe core 새버전이 나오면 master 브랜치에서 Merge후 develop 브랜치와 최종 Merge!