Commit Graph

63 Commits

Author SHA1 Message Date
Isaac Connor 208337635a Merge branch 'master' into storageareas 2016-08-01 19:30:01 -04:00
Steve Gilvarry 0234e82396 Enable local and travis ccache 2016-07-24 09:26:10 +10:00
Isaac Connor c7fee31c85 use --filter instead of -f because -f is ambiguous 2016-04-20 14:21:37 -04:00
Andrew Bauer d6a8d53b75 Merge pull request #1285 from SteveGilvarry/TravisUpdate
Travis update to Trusty, add Clang build and up ffmpeg version
2016-04-05 07:33:26 -05:00
SteveGilvarry e4a72f7653 Remove more Autotools files and edit travis to no longer build Autotools
Conflicts:
	.travis.yml
	bootstrap.sh
	configure.ac
2016-02-26 22:23:19 +11:00
SteveGilvarry b53e9e7dad ffmpeg 3.0 too many 0000s 2016-02-25 22:38:19 +11:00
SteveGilvarry 4fd984f30b ffmpeg 3.0.0 build 2016-02-25 22:32:18 +11:00
SteveGilvarry 4303aa4fe2 Remove libvlc5 and libvlccore5, also attempt clang builds 2016-02-13 16:34:49 +11:00
SteveGilvarry 5150829a9f Convert to Travis Trusty 2016-02-13 16:22:44 +11:00
SteveGilvarry 97b70b0e28 Update Travis to ffmpeg 2.8.1 for testing 2015-11-03 14:57:35 +11:00
SteveGilvarry 68351c29b9 Update to ffmpeg 2.7.2 in travis build 2015-08-11 22:12:45 +10:00
Isaac Connor 64d7a53cf6 remove lines I used for debugging. 2015-04-01 12:53:06 -04:00
Isaac Connor 5592f52cf8 add -I to aclocal command line since it is ignoring all other include directives 2015-04-01 12:18:45 -04:00
Isaac Connor fd62b1a71c show directory listing to see what's in the build dir. cat aclocal.m4 after it has actually been created. 2015-04-01 11:26:23 -04:00
Isaac Connor 59fbb4d0b5 ahem: only cat aclocal.m4 if using autotools 2015-04-01 11:16:05 -04:00
Isaac Connor b0e6ed1d4a check cwd and cat out the resulting aclocal.m4 in order to debug the lack of including our ac_check_sendfile macros. Also be more verbose from libtoolize 2015-04-01 11:05:11 -04:00
Kyle Johnson 7f585b8a44 Add sauce labs addon credentials to travis 2014-11-28 16:02:22 -05:00
Andrew Bauer 16c86e6604 Merge pull request #535 from knnniggett/travis_libvlc
Add libvlc to Travis
2014-10-26 15:08:59 -05:00
SteveGilvarry 838eb64537 Update Travis to ffmpeg 2.4.2 2014-10-23 20:22:09 +11:00
Andrew Bauer 6a1db0f895 Use libvlccore5 instead of 7 or 8 2014-10-19 10:11:17 -05:00
Andrew Bauer bdef494ac3 Use libvlccore7 instead of 8 2014-10-19 10:07:34 -05:00
Andrew Bauer 7bb8422b00 Add libvlc to Travis 2014-10-19 09:49:49 -05:00
SteveGilvarry 2926e9b26c Clone most recent ffmpeg release instead of master 2014-10-04 15:52:11 +10:00
SteveGilvarry d1d952729f Getting Tag to checkout 2014-10-04 15:25:08 +10:00
SteveGilvarry 6175dc040c Testing ffmpeg 2.4 2014-10-04 15:14:12 +10:00
SteveGilvarry 48f34884e7 ffmpeg checkout release 2.4.1 2014-10-03 01:39:17 +10:00
Andrew Bauer 1e8e710f5a full systemd support 2014-08-10 08:47:11 -05:00
Hamilton Turner b196965c4c Remove SVN install from Travis CI 2014-04-18 13:26:25 -04:00
Kyle Johnson ec9efc22c4 move after_success test to success in .travis.yml 2014-01-04 14:54:15 -05:00
Kyle Johnson d92d100784 Move travis db creative to before_script 2014-01-04 14:48:13 -05:00
Kyle Johnson 32286a4869 Added a zmcontrol after_success test 2014-01-02 11:51:19 -05:00
Kyle Johnson 739b7b3293 Added a zmfilter after_success test 2014-01-02 11:45:26 -05:00
Kfir Itzhak b743375dcf Attempt to get travis working again by skipping whole system update 2013-10-29 09:15:24 +02:00
mastertheknife 9c2e48ca01 Attempt three at zm database stuff on travis 2013-10-01 15:39:36 +03:00
mastertheknife 48c7892071 Another attempt to create the ZM database in travis 2013-10-01 15:29:54 +03:00
mastertheknife d171578cb8 Fixed not logging in to mysql with a password 2013-09-28 13:37:36 +03:00
mastertheknife 3321f26408 Modified .travis.yml to include kylejohnson's changes and fix it 2013-09-28 13:32:43 +03:00
mastertheknife db48a3d8fb Add matrix to the .travis.yml file 2013-09-28 13:04:41 +03:00
Kyle Johnson 9ac52b4a52 Replace the ZM_DB_PASS with an empty password for the travis test steps 2013-09-27 13:49:33 -04:00
Kyle Johnson 564fa216f8 Use the default travis user without a password 2013-09-27 13:32:38 -04:00
Kyle Johnson cd902b5dc1 Create the database for travis during the before_script step 2013-09-27 13:08:45 -04:00
Kyle Johnson 27349f87a6 Only grab the last 10 revisions and the master branch of ffmpeg for travis 2013-09-27 12:56:27 -04:00
Kyle Johnson 8983807570 Output apt-get install to /dev/null in travis - we don't care about it 2013-09-27 12:49:44 -04:00
Kyle Johnson fc6731e575 Create and use a dedicated ZM database user for the travis build steps 2013-09-27 12:46:16 -04:00
Kyle Johnson 167eff56be Removed verbosity, extra db creation from travis build steps and fixed a db name 2013-09-27 10:59:11 -04:00
Kyle Johnson beee057dd2 More work on the travis build steps 2013-09-27 10:48:00 -04:00
Kyle Johnson 44f4e2f981 Added a few steps to help me see the travis CI environment 2013-09-27 10:38:54 -04:00
Kyle Johnson 186b1c3836 Use the right database name 2013-09-27 09:59:23 -04:00
Kyle Johnson 3119ab7672 Added steps to install ZM binaries, insert a monitor and start ZM 2013-09-27 09:47:58 -04:00
Kyle Johnson 617cbc0edb Tell Travis to skip building the modern branch for now [skip ci] 2013-09-24 20:39:34 -04:00