Commit graph

228 commits

Author SHA1 Message Date
Dane Springmeyer
b02a8c3caf [travis] fix invalid bash on osx [skip ci] 2016-03-08 15:02:54 +01:00
Dane Springmeyer
1f0d96b983 remove earlier debug 2016-03-08 15:02:54 +01:00
Dane Springmeyer
b520e30cac more ccache debugging 2016-03-08 15:02:53 +01:00
Dane Springmeyer
bfef100505 upgrade ccache 2016-03-08 15:02:53 +01:00
Dane Springmeyer
c38aecdd3a debug ccache - refs #3350 2016-03-08 15:02:53 +01:00
Dane Springmeyer
daa1012e02 disable benchmarks from running on travis - refs #3351 2016-03-08 15:02:53 +01:00
Dane Springmeyer
b0f594eea1 Fix ccache stomping - refs #3350 2016-03-08 15:01:57 +01:00
Dane Springmeyer
973b461a54 [travis] switch coverage run to linux - closes #3344 2016-03-08 15:01:05 +01:00
artemp
65e81848ba Merge branch 'master' into spirit-x3 2016-03-03 12:04:55 +01:00
Dane Springmeyer
024cb86eff travis osx machines have 2 cores, so let's limit to 4 jobs 2016-03-02 12:47:32 -08:00
artemp
5535aa292f Merge branch 'master' into spirit-x3 2016-02-24 12:05:35 +01:00
Mickey Rose
efb06d2060 travis: move some shell code to separate script
- refs #3291
2016-02-18 15:40:13 +01:00
artemp
005959d81c Merge branch 'master' into spirit-x3 2016-02-17 09:49:56 +01:00
Dane Springmeyer
93c4974b1b fix PYTHONUSERBASE - broken since b3170c397c [skip ci] 2016-02-16 13:23:34 -08:00
artemp
48127c3754 use clang-3.6 for spirit-x3 branch (c++14 support) 2016-02-04 16:49:10 +01:00
artemp
a25993fc9b try JOBS=8/HEAVY_JOBS=4 2016-02-04 16:36:33 +01:00
artemp
8c1f71c39e try 8 JOBS 2016-02-04 12:51:20 +01:00
Dane Springmeyer
7ad4bf379d stick with clang-3.5 for now
- I have early evidence that mapnik compiled with 3.6 and mapnik-vt compiled with 3.5 == crashes
  - Also the mason deps are still compiled with 3.5
  - TODO: upgrade mapnik, mapnik-vt, and all mason deps to 3.6 all at once.
2016-02-03 11:18:00 -08:00
Mickey Rose
958fcbf165 travis: try fewer jobs on osx 2016-01-31 15:44:25 +01:00
Mickey Rose
f9248914af travis: add SCons timings, fix comment in Makefile 2016-01-31 15:36:00 +01:00
Dane Springmeyer
57027eeee3 trim back what we build on OS X to try to save time 2016-01-29 20:04:42 -08:00
Dane Springmeyer
971c37691b travis/osx - parellelize the heavy compile jobs
- We can probably get away with this since OS X
   does not have an OOM killer
 - Will watch to see if it actually helps overall build times...
2016-01-29 19:00:04 -08:00
Dane Springmeyer
7ddb3cc4a2 try more JOBS=10 on osx 2016-01-29 18:32:14 -08:00
Dane Springmeyer
09ce7a0ea2 use xcode7.2 rather than 7.0.1 2016-01-29 18:31:35 -08:00
Dane Springmeyer
0291e851fe disable g++4.9 build which gets killed / use clang 3.6 to prepare for c++14 support 2016-01-29 16:05:09 -08:00
Dane Springmeyer
b3170c397c travis: linux: test gcc49 / osx: use xcode7 - closes #3240 2016-01-29 15:31:13 -08:00
Mickey Rose
e9fbe0724f travis: fetch required git submodule pull requests 2016-01-24 18:34:28 +01:00
Dane Springmeyer
c82b4c8ba3 fix mason-latest publishing, broken since e547ee12 2016-01-05 13:34:11 -08:00
Dane Springmeyer
9c3fa6c739 rollback xcode7 usage, which broke pip install for unknown reasons 2015-11-05 13:16:36 -08:00
Dane Springmeyer
c77b1b887d use xcode7 2015-11-05 11:13:21 -08:00
Dane Springmeyer
34f5b56003 travis: get postgis running on osx 2015-10-30 14:36:01 -07:00
Dane Springmeyer
e547ee127c run/post coverage even if tests fail 2015-10-20 23:27:39 -07:00
Dane Springmeyer
499a2bdd74 re-enable OS X travis - we need code coverage back - refs #3033 2015-09-24 08:19:48 -07:00
Dane Springmeyer
487226b289 disable OS X builds until ccache/caching is working - refs #3033 2015-08-12 10:54:29 -07:00
Blake Thompson
6619de7b16 Modified where in travis mason publish is run 2015-06-17 14:48:49 -05:00
Blake Thompson
1377852020 Changed the travis build to now use static linking for mason latest 2015-06-16 11:11:34 -05:00
Blake Thompson
6960c85cd2 Removed pull requests from latest publishing closes #2794 2015-05-15 10:48:05 -05:00
Dane Springmeyer
9434fcae43 no benefit to caching mason_packages 2015-05-04 00:30:36 -07:00
Dane Springmeyer
e6536da644 higher git depth [skip ci] 2015-04-30 08:42:31 -07:00
Dane Springmeyer
d15c274847 stick with clang-3.5 for due to odd crash with 3.6 - refs #2785 2015-04-30 08:24:59 -07:00
Dane Springmeyer
7a1c5981fb be explict about depending on submodules 2015-04-30 07:25:24 -07:00
Dane Springmeyer
3af06a11c1 test-data now comes in via submodule - refs #2789 2015-04-30 07:25:01 -07:00
Blake Thompson
54b05800d9 Another slight update so that latest only builds from master 2015-04-29 08:51:22 -05:00
Blake Thompson
e12d53ba79 Added space 2015-04-29 08:29:45 -05:00
Blake Thompson
9d34b71cc7 UGH A BRACKET I HAVENT SEEN 2015-04-28 22:14:35 -05:00
Blake Thompson
a31d5ec19d Another commit to perhaps fix this travis issue... ugh. 2015-04-28 22:03:41 -05:00
Blake Thompson
7cb1d12079 A fix for travis issues? 2015-04-28 18:28:12 -05:00
Blake Thompson
5014f8beee A few more updates to the way travis and mason work 2015-04-28 17:30:18 -05:00
Blake Thompson
563316befb A small update to perhaps make all this stuff work 2015-04-28 12:21:55 -05:00
Blake Thompson
163c36c82b Moving some things around in script 2015-04-28 12:10:07 -05:00