diff --git a/.cow.json b/.cow.json index f53635b..5b959e2 100644 --- a/.cow.json +++ b/.cow.json @@ -2,6 +2,7 @@ "github-slug": "silverstripe/silverstripe-installer", "changelog-holder": "silverstripe/framework", "changelog-path": "docs/en/04_Changelogs/{stability}/{version}.md", + "changelog-template": ".cow/.changelog.md.twig", "child-stability-inherit": true, "dependency-constraint": "exact", "vendors": [ @@ -13,21 +14,5 @@ ], "exclude": [ "silverstripe/recipe-plugin" - ], - "archives": [ - { - "recipe": "silverstripe/recipe-core", - "files": [ - "SilverStripe-framework-v{version}.zip", - "SilverStripe-framework-v{version}.tar.gz" - ] - }, - { - "recipe": "silverstripe/installer", - "files": [ - "SilverStripe-cms-v{version}.zip", - "SilverStripe-cms-v{version}.tar.gz" - ] - } ] } diff --git a/.cow/changelog.md.twig b/.cow/changelog.md.twig new file mode 100644 index 0000000..89874f3 --- /dev/null +++ b/.cow/changelog.md.twig @@ -0,0 +1,12 @@ + # {{ version }} + +## Overview {{ '{#overview}' }} + +- + +## Upgrading {{ '{#upgrading}' }} + +... + +{{ logs }} + diff --git a/.travis.yml b/.travis.yml index 1c030b0..87c3ef2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,11 @@ language: php -dist: trusty +dist: xenial -before_install: - - sudo apt-get update - - sudo apt-get install chromium-chromedriver +services: + - mysql + - postgresql + - xvfb cache: directories: @@ -14,13 +15,13 @@ addons: apt: packages: - tidy + - chromium-chromedriver + - chromium-browser env: global: - TRAVIS_NODE_VERSION="6" - - COMPOSER_ROOT_VERSION="4.5.x-dev" - - DISPLAY=":99" - - XVFBARGS=":99 -ac -screen 0 1024x768x16" + - COMPOSER_ROOT_VERSION="4.x-dev" - SS_BASE_URL="http://localhost:8080/" - SS_ENVIRONMENT_TYPE="dev" @@ -74,6 +75,11 @@ before_script: # Extra $PATH - export PATH=/usr/lib/chromium-browser/:$PATH +# Remove preinstalled Chrome (google-chrome) + # this would conflict with our chromium-browser installation + # and its version is incompatible with chromium-chromedriver + - sudo apt-get remove -y --purge google-chrome-stable || true + # Init PHP - phpenv rehash - phpenv config-rm xdebug.ini || true @@ -81,7 +87,7 @@ before_script: # Install composer dependencies - composer validate - - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.2.x-dev; fi + - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.x-dev; fi - if [[ $BEHAT_TEST ]]; then composer require --no-update silverstripe/recipe-testing:^1; fi; - if [[ $HEALTH_TEST ]]; then composer require --no-update silverstripe/serve:^2; fi; - if ! [[ $HEALTH_TEST ]]; then composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile; fi; @@ -90,7 +96,6 @@ before_script: # Start behat services - if [[ $BEHAT_TEST ]] || [[ $HEALTH_TEST ]]; then mkdir artifacts; fi - if [[ $BEHAT_TEST ]] || [[ $HEALTH_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 ]] || [[ $HEALTH_TEST ]]; then (vendor/bin/serve --bootstrap-file vendor/silverstripe/cms/tests/behat/serve-bootstrap.php &> artifacts/serve.log &); sleep 3; fi diff --git a/composer.json b/composer.json index 044bace..e759f79 100644 --- a/composer.json +++ b/composer.json @@ -5,9 +5,9 @@ "require": { "php": ">=7.1.0", "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-cms": "4.5.x-dev", + "silverstripe/recipe-cms": "4.x-dev", "silverstripe-themes/simple": "~3.2.0", - "silverstripe/login-forms": "^4.0.x-dev" + "silverstripe/login-forms": "^4.0" }, "require-dev": { "phpunit/phpunit": "^5.7" @@ -21,9 +21,6 @@ "assets/*", "favicon.ico" ], - "branch-alias": { - "4.x-dev": "4.5.x-dev" - }, "resources-dir": "_resources" }, "config": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 7a62210..52895a4 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -19,7 +19,7 @@ --> - mysite/tests + app/tests vendor/silverstripe/cms/tests/php vendor/silverstripe/framework/tests/php