Permalink
Browse files

Merge pull request #2301 from YOURLS/checkbranch

Match YOURLS branch with Unit test branch
  • Loading branch information...
ozh committed Oct 7, 2017
2 parents 5a96355 + d708760 commit 8cbd20fd4b5e402d7f371ec5e6ed912398f5ed30
Showing with 15 additions and 0 deletions.
  1. +3 −0 .editorconfig
  2. +12 −0 .travis.yml
View
@@ -14,3 +14,6 @@ trim_trailing_whitespace = false
[*.js]
indent_size = 2
[*.yml]
indent_size = 2
View
@@ -29,6 +29,18 @@ before_script:
- phpunit --version
- mysql --version
- git clone git://github.com/YOURLS/YOURLS-unit-tests.git tests
- |
# Use same branch in YOURLS and YOURLS-unit-tests
export CURRENT_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}
echo "Current YOURLS branch: $CURRENT_BRANCH"
cd tests
if [ `git checkout $CURRENT_BRANCH &> /dev/null; echo $?` == 0 ]
then
echo "Using branch $CURRENT_BRANCH for Tests as well"
else
echo "Using branch master for Tests"
fi
cd ..
- git clone git://github.com/ozh/YOURLS-fr_FR.git user/languages/fr
- cp user/languages/fr/fr_FR.* user/languages
- mysql -e 'create database IF NOT EXISTS yourls_tests;'

0 comments on commit 8cbd20f

Please sign in to comment.