mirror of https://github.com/FriendsOfTYPO3/tea.git synced 2024-11-26 08:16:13 +01:00

[CLEANUP] Streamline .travis.yml and composer.json (#24)

Use latest changes from ext_scaffold.
This commit is contained in:
Oliver Klee 2018-05-28 15:08:56 +02:00 committed by GitHub
parent 67eb471c04
commit b0ede23c29
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 27 deletions

View file

@ -11,8 +11,8 @@ env:
global: global:
- typo3DatabaseHost=localhost typo3DatabaseName=typo3 typo3DatabaseUsername=travis typo3DatabasePassword='' - typo3DatabaseHost=localhost typo3DatabaseName=typo3 typo3DatabaseUsername=travis typo3DatabasePassword=''
matrix: matrix:
- TYPO3_VERSION="^8.7" DEPENDENCIES=latest - TYPO3_VERSION="^8.7"
- TYPO3_VERSION="^8.7" DEPENDENCIES=oldest - TYPO3_VERSION="^8.7" DEPENDENCIES_PREFERENCE="--prefer-lowest"
matrix: matrix:
exclude: exclude:
@ -26,22 +26,8 @@ before_install:
- phpenv config-rm xdebug.ini - phpenv config-rm xdebug.ini
install: install:
- > - composer require typo3/minimal "$TYPO3_VERSION" $DEPENDENCIES_PREFERENCE
composer require-typo3-version "$TYPO3_VERSION"; - git checkout .
- >
echo;
if [ "$DEPENDENCIES" = "latest" ]; then
echo "Installing the latest dependencies";
composer update --with-dependencies --prefer-stable --prefer-dist;
else
echo "Installing the lowest dependencies";
composer update --with-dependencies --prefer-stable --prefer-dist --prefer-lowest;
fi;
composer show;
- >
echo;
echo "Restoring the composer.json";
git checkout .;
script: script:
- > - >

View file

@ -27,21 +27,24 @@
}, },
"require": { "require": {
"php": "~7.0.0 || ~7.1.0 || ~7.2.0", "php": "~7.0.0 || ~7.1.0 || ~7.2.0",
"typo3/cms-core": "^7.6.23 || ^8.7.9", "typo3/cms-core": "^7.6.23 || ^8.7.10",
"typo3/cms-fluid": "^7.6.23 || ^8.7.9", "typo3/cms-fluid": "^7.6.23 || ^8.7.10",
"typo3/cms-frontend": "^7.6.23 || ^8.7.9" "typo3/cms-frontend": "^7.6.23 || ^8.7.10"
}, },
"require-dev": { "require-dev": {
"typo3/cms-fluid-styled-content": "^7.6.23 || ^8.7.9", "typo3/cms-fluid-styled-content": "^7.6.23 || ^8.7.10",
"helhum/typo3-composer-setup": "^0.5.1", "helhum/typo3-composer-setup": "^0.5.1",
"helmich/typo3-typoscript-lint": "^1.4.4", "helmich/typo3-typoscript-lint": "^1.4.4",
"nimut/testing-framework": "^3.0.0", "nimut/testing-framework": "^3.0",
"roave/security-advisories": "dev-master" "roave/security-advisories": "dev-master"
}, },
"replace": { "replace": {
"tea": "self.version", "tea": "self.version",
"typo3-ter/tea": "self.version" "typo3-ter/tea": "self.version"
}, },
"conflict": {
"typo3/cms-composer-installers": "<1.4.6"
},
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"OliverKlee\\Tea\\": "Classes/" "OliverKlee\\Tea\\": "Classes/"
@ -84,10 +87,6 @@
"ci": [ "ci": [
"@ci:static" "@ci:static"
], ],
"require-typo3-version": [
"@php -r '$conf=json_decode(file_get_contents(__DIR__.\"/composer.json\"),true);$conf[\"require\"][\"typo3/cms-core\"]=$_SERVER[\"argv\"][1];file_put_contents(__DIR__.\"/composer.json\",json_encode($conf,JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT).chr(10));'",
"@composer install"
],
"link-extension": [ "link-extension": [
"@php -r 'is_dir($extFolder=__DIR__.\"/.Build/public/typo3conf/ext/\") || mkdir($extFolder, 0777, true);'", "@php -r 'is_dir($extFolder=__DIR__.\"/.Build/public/typo3conf/ext/\") || mkdir($extFolder, 0777, true);'",
"@php -r 'file_exists($extFolder=__DIR__.\"/.Build/public/typo3conf/ext/tea\") || symlink(__DIR__,$extFolder);'" "@php -r 'file_exists($extFolder=__DIR__.\"/.Build/public/typo3conf/ext/tea\") || symlink(__DIR__,$extFolder);'"
@ -101,6 +100,7 @@
"dev-master": "2.0.x-dev" "dev-master": "2.0.x-dev"
}, },
"typo3/cms": { "typo3/cms": {
"extension-key": "tea",
"cms-package-dir": "{$vendor-dir}/typo3/cms", "cms-package-dir": "{$vendor-dir}/typo3/cms",
"web-dir": ".Build/public" "web-dir": ".Build/public"
} }