Run Travis CI tests on OS X as well #12909

Merged
merged 4 commits into from Jan 21, 2017

Projects

None yet

2 participants

@nijel
Member
nijel commented Jan 20, 2017 edited

Issue #12883

Signed-off-by: Michal Čihař michal@cihar.com

Before submitting pull request, please check that every commit:

  • Has proper Signed-Off-By
  • Has commit message which describes it
  • Is needed on it's own, if you have just minor fixes to previous commits, you can squash them
  • Any new functionality is covered by tests
@nijel nijel self-assigned this Jan 20, 2017
@codecov-io
codecov-io commented Jan 20, 2017 edited

Current coverage is 54.18% (diff: 100%)

Merging #12909 into master will increase coverage by <.01%

@@             master     #12909   diff @@
==========================================
  Files           466        466          
  Lines         69627      69633     +6   
  Methods        2126       2126          
  Messages          0          0          
  Branches          0          0          
==========================================
+ Hits          37728      37734     +6   
  Misses        31899      31899          
  Partials          0          0          

Powered by Codecov. Last update 8fbe815...3934024

@nijel
Member
nijel commented Jan 20, 2017 edited

Unfortunately this is not that easy, as Travis CI does not officially support PHP on OSX builds, see travis-ci/travis-ci#2313 or MySQL, see travis-ci/travis-ci#4810

nijel added some commits Jan 20, 2017
@nijel nijel Specify we are using MySQL service
Signed-off-by: Michal Čihař <michal@cihar.com>
9484413
@nijel nijel Do not create database if exits
Signed-off-by: Michal Čihař <michal@cihar.com>
9d24e46
@nijel nijel Run Travis CI tests on OS X as well
- install dependencies using brew
- manuall start MariaDB server

Issue #12883

Signed-off-by: Michal Čihař <michal@cihar.com>
9ecda41
@nijel nijel Handle AM/PM marks in date on our own
This is same as with months and days in week - we can not rely on the
PHP providing sane result. Also this way we can properly translate it to
all supported languages.

For example on OS X, the strftime function does not seem to respect PHP
locales and always use system ones.

Fixes #12913

Signed-off-by: Michal Čihař <michal@cihar.com>
3934024
@nijel nijel changed the title from WIP: Run Travis CI tests on OS X as well to Run Travis CI tests on OS X as well Jan 21, 2017
@nijel nijel merged commit 8384199 into phpmyadmin:master Jan 21, 2017

4 checks passed

Scrutinizer No new issues
Details
codecov/patch 100% of diff hit (target 54.18%)
Details
codecov/project 54.18% (+<.01%) compared to 8fbe815
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@nijel nijel deleted the nijel:osx branch Jan 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment