[BUGFIX] Create history record only with valid log uid
[Packages/TYPO3.CMS.git] / .travis.yml
index 92bd69e..70282dd 100644 (file)
@@ -10,10 +10,17 @@ env:
   - DB=none FUNCTIONALTESTS=1
   - DB=none PHPLINT=1
 
+notifications:
+  irc:
+    - "irc.freenode.net#typo3-cms"
+  email:
+    - typo3-team-core@lists.typo3.org
+
 services:
   - memcached
 
 before_script:
+  - sudo apt-get update && sudo apt-get install git
   - git clone --single-branch --branch master --depth 1 git://github.com/typo3-ci/TYPO3-Travis-Integration.git build-environment
   - source build-environment/install-helper.sh
 
@@ -28,7 +35,7 @@ before_script:
        installPhpModule -y memcache
        installPhpModule redis
        mv build-environment/typo3conf .
-       git clone --single-branch --branch master --depth 1 git://git.typo3.org/TYPO3v4/Extensions/phpunit.git typo3conf/ext/phpunit/
+       git clone --single-branch --branch master --depth 1 git://git.typo3.org/TYPO3CMS/Extensions/phpunit.git typo3conf/ext/phpunit/
        mkdir fileadmin
        mkdir uploads
        mkdir typo3temp
@@ -37,10 +44,8 @@ before_script:
   - >
     if [[ "$FUNCTIONALTESTS" == "1" ]]; then
        mv build-environment/typo3conf .
-       git clone --single-branch --branch master --depth 1 git://git.typo3.org/TYPO3v4/Extensions/phpunit.git typo3conf/ext/phpunit/
+       git clone --single-branch --branch master --depth 1 git://git.typo3.org/TYPO3CMS/Extensions/phpunit.git typo3conf/ext/phpunit/
        mkdir typo3temp
-       chmod u+x ./typo3conf/ext/phpunit/Composer/vendor/bin/phpunit
-       chmod u+x ./typo3conf/ext/phpunit/Composer/vendor/phpunit/phpunit/composer/bin/phpunit
     fi
 
   - >
@@ -55,12 +60,10 @@ script:
   - >
     if [[ "$PHPLINT" == "1" ]]; then
        phpLint all
-    fi
-  - >
-    if [[ "$UNITTESTS" == "1" ]]; then
-       php $PWD/typo3/cli_dispatch.phpsh phpunit -c typo3/sysext/core/Build/UnitTests.xml
-    fi
-  - >
-    if [[ "$FUNCTIONALTESTS" == "1" ]]; then
+    elif [[ "$UNITTESTS" == "1" ]]; then
+       ./typo3conf/ext/phpunit/Composer/vendor/bin/phpunit -c typo3/sysext/core/Build/UnitTests.xml
+    elif [[ "$FUNCTIONALTESTS" == "1" ]]; then
        ./typo3conf/ext/phpunit/Composer/vendor/bin/phpunit -c typo3/sysext/core/Build/FunctionalTests.xml
-    fi
\ No newline at end of file
+    else
+       exit 1
+    fi