diff options
| author | Thomas Steur <thomas.steur@googlemail.com> | 2014-07-01 01:50:58 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-07-01 01:50:58 +0400 |
| commit | dbb5afaedbc9c2cd572681cc437a6ac914d55836 (patch) | |
| tree | 1b5cff5e234e27b1d451ca771d38f10808f93c62 /tests/travis | |
| parent | 356aaf102c4adffe6ad434dbad41293a019ea5dd (diff) | |
simplify again, this should work
Diffstat (limited to 'tests/travis')
| -rwxr-xr-x | tests/travis/initiate_ui_tests.sh | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/travis/initiate_ui_tests.sh b/tests/travis/initiate_ui_tests.sh index 6a39f5084d..233fd74ae0 100755 --- a/tests/travis/initiate_ui_tests.sh +++ b/tests/travis/initiate_ui_tests.sh @@ -23,13 +23,8 @@ git config --global user.email "hello@piwik.org" git config --global user.name "Piwik Automation" UI_BRANCH="report_and_dimension_refactoring" -echo $UI_BRANCH -git reset --hard -git clean -f -d git checkout $UI_BRANCH -git reset --hard -git clean -f -d -git pull origin $UI_BRANCH +git pull --rebase origin $UI_BRANCH echo "$TRAVIS_COMMIT $TRAVIS_BRANCH" > piwik_commit.txt |