From add8d279f1d7b3b2666bb72935ff23c795bf812c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 6 Aug 2018 13:18:39 +0200 Subject: [PATCH 1/3] EZP-29455: Increase Composer memory limit. Add PlatformUI on Varnish job, Travis notifications. Build tags (#310) --- .env | 1 + .travis.yml | 15 ++++++++++++--- doc/docker/install.yml | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.env b/.env index d63bf57ad4..195cfb0aa4 100644 --- a/.env +++ b/.env @@ -4,6 +4,7 @@ COMPOSE_DIR=. # You'll need to adjust this for Windows and XDB Linux systems: https://getcomposer.org/doc/03-cli.md#composer-home COMPOSER_HOME=~/.composer +COMPOSER_MEMORY_LIMIT=2G DATABASE_USER=ezp DATABASE_PASSWORD=SetYourOwnPassword DATABASE_NAME=ezp diff --git a/.travis.yml b/.travis.yml index fe8b58390f..a6938276ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,13 +20,17 @@ env: - TEST_CMD="bin/behat -vv --profile=rest --suite=fullXml --tags=~@broken" - TEST_CMD="bin/behat -vv --profile=core --tags=~@broken" - TEST_CMD="bin/phpunit -v vendor/ezsystems/ezpublish-kernel/eZ/Bundle/EzPublishRestBundle/Tests/Functional" - - TEST_CMD="bin/behat -vv --profile=platformui --tags='@common'" COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/redis.yml:doc/docker/selenium.yml" + - TEST_CMD="bin/behat -vv --profile=platformui --tags='@common'" COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/selenium.yml" + - TEST_CMD="bin/behat -vv --profile=platformui --tags='@common'" COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/varnish.yml:doc/docker/redis.yml:doc/docker/selenium.yml" WEB_HOST="varnish" + # test only master (+ Pull requests) branches: only: - master - /^\d.\d+$/ + # build tags (vX.Y.Z) + - /^v\d+.\d+.\d+$/ # Update Docker and Docker Compose before_install: ./bin/.travis/trusty/update_docker.sh @@ -53,9 +57,14 @@ after_failure: # Will show us what is up, and how long it's been up - docker ps -s -# disable mail notifications notifications: - email: false + slack: + rooms: + - secure: ESkZY5bzNWua0eHc9rBkuE7AZrCNzLeCV1Rtn97h9KIBeuxsiB3heDUAOi3xZkqO4AyKD5AitAM2k7dTdQKvC8WMooHFWFdjlsSepUvjJISy8keY9kiXywUJ1S/YCwMPwT+HAWB4Qk2zyKmlLmZ8IfAK5aBtndXFQFQCqyeW4PE= + - secure: NlXxYbeVV7mWDTUgeFK0VrUdXGBF4lPVpMLZ3WXYDTUWfFyM8tiChENo/u/9n7tSz6KIxdWpy0j7h8+EjVUVCGxS+4q+kdzkfm1Vwq3ANhMsGBDcwdm7gYWhdd43aXV9ZaZPVUWv5C3yizzmYXeuNtviFDA5DEvrE5Rdp6sBsRE= + on_success: change + on_failure: always + on_pull_requests: false # reduce depth (history) of git checkout git: diff --git a/doc/docker/install.yml b/doc/docker/install.yml index 6836bd7e92..1ef7e2ea73 100644 --- a/doc/docker/install.yml +++ b/doc/docker/install.yml @@ -20,6 +20,7 @@ services: depends_on: - install_db environment: + - COMPOSER_MEMORY_LIMIT - SYMFONY_ENV=${SYMFONY_ENV-prod} - SYMFONY_DEBUG - DATABASE_USER From b88363fe40f2cfb4491ffff26d497550eafed9a5 Mon Sep 17 00:00:00 2001 From: Marek Nocon Date: Mon, 6 Aug 2018 14:41:18 +0200 Subject: [PATCH 2/3] Remove unwanted files --- bin/behat | 1 - bin/doctrine-dbal | 1 - bin/php-parse | 1 - bin/phpunit | 1 - bin/security-checker | 1 - test.sh | 9 --------- 6 files changed, 14 deletions(-) delete mode 120000 bin/behat delete mode 120000 bin/doctrine-dbal delete mode 120000 bin/php-parse delete mode 120000 bin/phpunit delete mode 120000 bin/security-checker delete mode 100755 test.sh diff --git a/bin/behat b/bin/behat deleted file mode 120000 index ec35dd9074..0000000000 --- a/bin/behat +++ /dev/null @@ -1 +0,0 @@ -../vendor/behat/behat/bin/behat \ No newline at end of file diff --git a/bin/doctrine-dbal b/bin/doctrine-dbal deleted file mode 120000 index 110e93c537..0000000000 --- a/bin/doctrine-dbal +++ /dev/null @@ -1 +0,0 @@ -../vendor/doctrine/dbal/bin/doctrine-dbal \ No newline at end of file diff --git a/bin/php-parse b/bin/php-parse deleted file mode 120000 index 726f6347e7..0000000000 --- a/bin/php-parse +++ /dev/null @@ -1 +0,0 @@ -../vendor/nikic/php-parser/bin/php-parse \ No newline at end of file diff --git a/bin/phpunit b/bin/phpunit deleted file mode 120000 index 4ba325648f..0000000000 --- a/bin/phpunit +++ /dev/null @@ -1 +0,0 @@ -../vendor/phpunit/phpunit/phpunit \ No newline at end of file diff --git a/bin/security-checker b/bin/security-checker deleted file mode 120000 index 85f6e8ed6b..0000000000 --- a/bin/security-checker +++ /dev/null @@ -1 +0,0 @@ -../vendor/sensiolabs/security-checker/security-checker \ No newline at end of file diff --git a/test.sh b/test.sh deleted file mode 100755 index db465e6f62..0000000000 --- a/test.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/bash - - -echo $CRON_ONLY -echo $TRAVIS_CRON - -if [ "$CRON_ONLY" -eq "1" ] && [ "$TRAVIS_CRON" != "CRON" ]; then - echo 'nie uruchom, exit' -fi From 56fe7112b40bfc71c259f2e779b694facca68a96 Mon Sep 17 00:00:00 2001 From: Marek Nocon Date: Mon, 6 Aug 2018 15:23:00 +0200 Subject: [PATCH 3/3] [TRAVIS] Exclude tests using API from running on Redis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1a84de5022..46111babee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ env: - TEST_CMD="bin/behat -v --profile=repository-forms --tags=~@broken" COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/selenium.yml" - TEST_CMD="bin/behat -v --profile=behat --tags=~@broken" - TEST_CMD="bin/behat --profile=adminui --suite=adminui --no-interaction -vv" COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/selenium.yml" - - TEST_CMD="bin/behat --profile=adminui --suite=adminui --no-interaction -vv" COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/varnish.yml:doc/docker/redis.yml:doc/docker/selenium.yml" WEB_HOST="varnish" + - TEST_CMD="bin/behat --profile=adminui --suite=adminui --no-interaction -vv --tags=~@EZP-29291-excluded" COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/varnish.yml:doc/docker/redis.yml:doc/docker/selenium.yml" WEB_HOST="varnish" # test only master (+ Pull requests) branches: