-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce…
… into Troll-PR
- Loading branch information
Showing
153 changed files
with
1,487 additions
and
1,066 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,70 +1,39 @@ | ||
| sudo: required | ||
| dist: trusty | ||
|
|
||
| addons: | ||
| apt: | ||
| packages: | ||
| - mysql-server-5.6 | ||
| - mysql-client-core-5.6 | ||
| - mysql-client-5.6 | ||
| - postfix | ||
| language: php | ||
| php: | ||
| - 5.5 | ||
| - 5.6 | ||
| - 7.0 | ||
| env: | ||
| - TEST_SUITE=unit | ||
| - TEST_SUITE=integration_part_1 | ||
| - TEST_SUITE=integration_part_2 | ||
| - TEST_SUITE=integration_integrity | ||
| - TEST_SUITE=static | ||
| global: | ||
| - COMPOSER_BIN_DIR=~/bin | ||
| - INTEGRATION_SETS=2 | ||
| matrix: | ||
| - TEST_SUITE=unit | ||
| - TEST_SUITE=integration INTEGRATION_INDEX=1 | ||
| - TEST_SUITE=integration INTEGRATION_INDEX=2 | ||
| - TEST_SUITE=static | ||
| cache: | ||
| apt: true | ||
| directories: | ||
| - $HOME/.composer/cache | ||
| - $HOME/.cache/bin | ||
| directories: $HOME/.composer/cache | ||
| matrix: | ||
| exclude: | ||
| - php: 5.6 | ||
| env: TEST_SUITE=static | ||
| - php: 7.0 | ||
| env: TEST_SUITE=static | ||
| before_install: | ||
| - sudo apt-get update -qq | ||
| - sudo apt-get install -y -qq postfix | ||
| - sh -c 'if [ "$CASHER_DIR" ]; then | ||
| if [ -x $HOME/.cache/bin/composer ]; then | ||
| $HOME/.cache/bin/composer self-update; echo ''; | ||
| else | ||
| mkdir -p $HOME/.cache/bin; | ||
| curl --connect-timeout 30 -sS https://getcomposer.org/installer | ||
| | php -- --install-dir $HOME/.cache/bin/ --filename composer; | ||
| fi | ||
| fi' | ||
| - export PATH="$HOME/.cache/bin:$PATH" | ||
| before_script: | ||
| # Mock mail | ||
| - sudo service postfix stop | ||
| - smtp-sink -d "%d.%H.%M.%S" localhost:2500 1000 & | ||
| - echo 'sendmail_path = "/usr/sbin/sendmail -t -i "' > $(php --ini|grep -m 1 "ini files in:"|cut -d ":" -f 2)/sendmail.ini | ||
| # Disable xDebug | ||
| - echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini | ||
| # Install MySQL 5.6, create DB for integration tests | ||
| - > | ||
| sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then | ||
| sudo apt-get remove -y -qq --purge mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5; | ||
| sudo apt-get -y -qq autoremove; | ||
| sudo apt-get -y -qq autoclean; | ||
| sudo apt-get install -y -qq mysql-server-5.6 mysql-client-5.6; | ||
| mysql -uroot -e 'SET @@global.sql_mode = NO_ENGINE_SUBSTITUTION; CREATE DATABASE magento_integration_tests;'; | ||
| mv dev/tests/integration/etc/install-config-mysql.travis.php.dist dev/tests/integration/etc/install-config-mysql.php; | ||
| fi" | ||
| # Change memory_limit for travis | ||
| - echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini | ||
| - phpenv rehash; | ||
| - composer install --no-interaction --prefer-dist | ||
| script: | ||
| # Unit tests | ||
| - sh -c "if [ '$TEST_SUITE' = 'unit' ]; then ./vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist; fi" | ||
| # Integration tests | ||
| - sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ]; then cd dev/tests/integration/; bash IntegationTestsForTravis.sh 2; fi" | ||
| - sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis1; fi" | ||
| - sh -c "if [ '$TEST_SUITE' = 'integration_part_2' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis2; fi" | ||
| # Integration integrity tests | ||
| - sh -c "if [ '$TEST_SUITE' = 'integration_integrity' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.dist testsuite/Magento/Test/Integrity; fi" | ||
| # Static tests [Code Style] | ||
| - sh -c "if [ '$TEST_SUITE' = 'static' ]; then cd dev/tests/static/; php get_github_changes.php --output-file='$TRAVIS_BUILD_DIR/dev/tests/static/testsuite/Magento/Test/_files/changed_files_ce.txt' --base-path='$TRAVIS_BUILD_DIR' --repo='https://github.com/magento/magento2.git' --branch='develop'; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest'; fi" | ||
| before_install: ./dev/travis/before_install.sh | ||
| install: composer install --no-interaction --prefer-dist | ||
| before_script: ./dev/travis/before_script.sh | ||
| script: | ||
| - cd dev/tests/$TEST_SUITE | ||
| - test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true | ||
| - phpunit $TEST_FILTER |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.