Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge up asset-admin test into 3.2 #250

Merged
merged 6 commits into from
Feb 27, 2020
Merged

Merge up asset-admin test into 3.2 #250

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f447db4
BUG Add asset-admin test to travis build
Feb 24, 2020
bc908b5
Merge pull request #249 from open-sausages/pulls/3.1/test-against-ass…
emteknetnz Feb 25, 2020
5c69df1
Merge branch '3.1' into pulls/3.2/merge-up-asset-admin-tests
Feb 26, 2020
aceefd3
BUG Increment asset-admin travis build target
Feb 26, 2020
9395ea2
Merge branch '3.2' into pulls/3.2/merge-up-asset-admin-tests
Feb 26, 2020
92e64a7
Fix behat set up
Feb 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 35 additions & 10 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,62 @@ language: php

dist: trusty

before_install:
- if [[ $BEHAT_TEST ]]; then sudo apt-get update && sudo apt-get install chromium-chromedriver; fi

env:
global:
- COMPOSER_ROOT_VERSION=3.x-dev
- COMPOSER_ROOT_VERSION=3.1.x-dev
maxime-rainville marked this conversation as resolved.
Show resolved Hide resolved
- DISPLAY=":99"
- XVFBARGS=":99 -ac -screen 0 1024x768x16"
- SS_BASE_URL="http://localhost:8080/"
- SS_ENVIRONMENT_TYPE="dev"
- BEHAT_RECIPE_CMS_VERSION=4.4.x-dev
maxime-rainville marked this conversation as resolved.
Show resolved Hide resolved
- ASSET_ADMIN_VERSION=1.4.x-dev
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be 1.4 or 1.5?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You were looking at the older commit that was targeting the 3.1 branch I think.


matrix:
fast_finish: true
include:
- php: 7.1.2
env: DB=PGSQL PHPUNIT_TEST=1 PHPCS_TEST=1
- php: 7.1.2
env: DB=MYSQL PHPUNIT_TEST=1
- php: 7.1.2
- php: 7.1
env: DB=MYSQL PDO=1 PHPUNIT_COVERAGE_TEST=1
- php: 7.2
env: DB=MYSQL PHPUNIT_TEST=1
- php: 7.3
env: DB=PGSQL PHPUNIT_TEST=1 PHPCS_TEST=1
- php: 7.3
env: DB=MYSQL BEHAT_TEST=1
- php: 7.3
env: DB=MYSQL ASSETADMIN_TEST=1

before_script:
# Extra $PATH
- export PATH=/usr/lib/chromium-browser/:$PATH

# Init PHP
- composer self-update || true
- phpenv rehash
- phpenv config-rm xdebug.ini

# Install composer dependencies
- composer validate
- composer install --prefer-dist
- composer require --prefer-dist --no-update silverstripe/recipe-core:4.x-dev silverstripe/versioned:1.x-dev silverstripe/assets:1.x-dev --prefer-dist
- if [[ ! $BEHAT_TEST ]]; then composer require --prefer-dist --no-update silverstripe/recipe-core:4.x-dev silverstripe/versioned:1.x-dev silverstripe/assets:1.x-dev --prefer-dist ; fi
- if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.x-dev --prefer-dist --no-update; fi
- if [[ $ASSETADMIN_TEST ]]; then composer require silverstripe/asset-admin $ASSET_ADMIN_VERSION --prefer-source --no-update ; fi
- if [[ $BEHAT_TEST ]]; then composer require silverstripe/recipe-testing:^1 silverstripe/recipe-cms $BEHAT_RECIPE_CMS_VERSION --prefer-source --no-update ; fi
- composer update
- if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.x-dev --prefer-dist; fi

- if [[ $BEHAT_TEST ]]; then mkdir artifacts; fi
- if [[ $BEHAT_TEST ]]; then cp composer.lock artifacts/; fi
- if [[ $BEHAT_TEST ]]; then sh -e /etc/init.d/xvfb start; sleep 3; fi
- if [[ $BEHAT_TEST ]]; then (chromedriver > artifacts/chromedriver.log 2>&1 &); fi
- if [[ $BEHAT_TEST ]]; then (vendor/bin/serve --bootstrap-file vendor/silverstripe/cms/tests/behat/serve-bootstrap.php &> artifacts/serve.log &); fi

script:
- if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
- if [[ $PHPCS_TEST ]]; then composer run-script lint; fi
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then vendor/bin/phpunit --coverage-clover=coverage.xml; fi
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml -vvv; fi
- if [[ $BEHAT_TEST ]]; then vendor/bin/behat @asset-admin --config vendor/silverstripe/asset-admin/behat.yml ; fi
- if [[ $ASSETADMIN_TEST ]]; then vendor/bin/phpunit vendor/silverstripe/asset-admin/tests; fi

after_success:
- if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi