tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-10-22 11:05:55 +02:00
Code Issues Projects Releases Wiki Activity

Travis config update, remove branch aliases

Browse Source
This commit is contained in:
Serge Latyntcev 2019-11-05 14:47:03 +13:00
parent b32499ef31
commit 1a7d22d2bf
2 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.travis.yml
View File

@ -1,14 +1,22 @@
language: php
dist: trusty
dist: xenial
before_install:
- sudo apt-get update
- sudo apt-get install chromium-chromedriver
services:
- mysql
- postgresql
- xvfb
addons:
apt:
packages:
- tidy
- chromium-chromedriver
- chromium-browser
env:
global:
- COMPOSER_ROOT_VERSION="2.3.x-dev"
- COMPOSER_ROOT_VERSION="2.x-dev"
- DISPLAY=":99"
- XVFBARGS=":99 -ac -screen 0 1024x768x16"
- SS_BASE_URL="http://localhost:8080/"
@ -16,20 +24,19 @@ env:
matrix:
include:
- php: 5.6
env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
- php: 7.0
env: DB=PGSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1
- php: 7.1
env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev BEHAT_TEST=1
env: DB=MYSQL PHPCS_TEST=1 PHPUNIT_TEST=1
- php: 7.1
env: DB=PGSQL PHPUNIT_TEST=1
- php: 7.1
env: DB=MYSQL BEHAT_TEST=1
- php: 7.2
env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1
- php: 7.2
env: DB=MYSQL INSTALLER_VERSION=4.x-dev BEHAT_TEST=1
env: DB=MYSQL PHPUNIT_TEST=1
- php: 7.3
env: DB=MYSQL INSTALLER_VERSION=4.4.x-dev PHPUNIT_TEST=1
env: DB=MYSQL PHPUNIT_TEST=1
before_script:
- sudo apt-get remove -y --purge google-chrome-stable || true
# Extra $PATH
- export PATH=/usr/lib/chromium-browser/:$PATH
@ -40,14 +47,13 @@ before_script:
# Install composer
- composer validate
- composer require silverstripe/installer:"$INSTALLER_VERSION" silverstripe/recipe-testing:^1 --no-update
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.2.x-dev; fi
- composer require silverstripe/installer:^4 silverstripe/recipe-testing:^1 --no-update
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:^2; fi
- composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
# Behat bootstrapping
- 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

15
composer.json
View File

@ -15,12 +15,12 @@
}
],
"require": {
"silverstripe/framework": "^4.4@dev",
"silverstripe/cms": "^4.4@dev",
"silverstripe/admin": "^1.4@dev",
"silverstripe/asset-admin": "^1.4@dev",
"silverstripe/errorpage": "^1.4@dev",
"silverstripe/versioned": "^1.4@dev"
"silverstripe/framework": "^4",
"silverstripe/cms": "^4",
"silverstripe/admin": "^1",
"silverstripe/asset-admin": "^1",
"silverstripe/errorpage": "^1",
"silverstripe/versioned": "^1"
},
"require-dev": {
"phpunit/phpunit": "^5.7",
@ -33,9 +33,6 @@
}
},
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
},
"expose": [
"javascript",
"css"