Commit Graph

12 Commits

Author SHA1 Message Date
Carter Sande
33e756656d Update .travis.yml to reflect qt->qt@4 change 2017-04-10 09:10:16 -07:00
Srivats P
756197a69c Squashed commit of the following:
commit 33ad1abb1e
Author: Srivats P <pstavirs@users.noreply.github.com>
Date:   Wed Jan 4 18:21:07 2017 +0530

    Make osx_image global

commit d90a99f052
Author: Srivats P <pstavirs@users.noreply.github.com>
Date:   Tue Jan 3 22:21:02 2017 +0530

    include not exclude the osx image

commit 4038ca84bd
Author: Srivats P <pstavirs@users.noreply.github.com>
Date:   Tue Jan 3 21:36:46 2017 +0530

    Fix osx_image location again

commit 232dfdb0bc
Author: Srivats P <pstavirs@users.noreply.github.com>
Date:   Tue Jan 3 21:16:15 2017 +0530

    Fix incorrect location of overriding osx_image

commit 00a487cb6f
Author: Srivats P <pstavirs@users.noreply.github.com>
Date:   Tue Jan 3 20:58:09 2017 +0530

    Force sierra instead of el-capitan

    See https://github.com/cartr/homebrew-qt4/issues/7

commit 33c39b8e24
Author: Srivats P <pstavirs@users.noreply.github.com>
Date:   Tue Jan 3 20:37:26 2017 +0530

    Troubleshoot osx build break changeset #4

commit 8d168099fb
Author: Srivats P <pstavirs@users.noreply.github.com>
Date:   Tue Jan 3 19:03:56 2017 +0530

    Troubleshoot Travis OSX build break changeset #3

commit ae149d0263
Author: Srivats P <pstavirs@users.noreply.github.com>
Date:   Tue Jan 3 18:24:51 2017 +0530

    troubleshoot osx build break - changeset #2

commit 2626339679
Author: Srivats P <pstavirs@users.noreply.github.com>
Date:   Tue Jan 3 18:11:46 2017 +0530

    debug changes to troubleshoot osx build break

commit f3423b7d84
Author: Srivats P <pstavirs@users.noreply.github.com>
Date:   Sun Jan 1 12:49:57 2017 +0530

    Use latest protobuf version in HomeBrew

    We had reverted to using protobuf 2.6 when protobuf 3.0 had a regression
    issue with respect to RPCs - this has been fixed in v3.1.0
2017-01-28 11:23:59 +05:30
Srivats P
2422df21ca Rename protobuf version to 'tap' into correct one 2016-09-13 21:20:32 +05:30
Srivats P
15ccd25041 Use protobuf-2.6 for osx builds since 3.0 breaks ostinato build 2016-09-13 20:37:03 +05:30
Srivats P
851278a41f CI: no luck with OSX/gcc - so excluding this combo for now 2015-12-05 21:33:56 +05:30
Srivats P
6fbfc4b375 CI: Another try for OSX/gcc; added build notification email 2015-12-05 21:21:56 +05:30
Srivats P
b027156384 CI: Change $CXX also for gcc-4.8 on OSX 2015-12-05 20:29:53 +05:30
Srivats P
f58372b348 CI: Use the 'real' gcc on OSX; restore linux which was removed earlier temporarily 2015-12-05 19:37:12 +05:30
Srivats P
54e7e8c03d CI: Add OSX dependencies 2015-12-05 19:06:28 +05:30
Srivats P
600960a6d0 CI: Add OSX 2015-12-05 18:13:32 +05:30
Srivats P
dbf91934a8 Fixing the protoc compiler in travis config 2015-09-09 18:45:59 +05:30
Srivats P
5727d751da Added Travis CI YAML 2015-09-09 18:36:42 +05:30