Commit graph

175 commits

Author SHA1 Message Date
Dane Springmeyer
30d8c2b686 travis: even more aggressive JOBS 2014-07-24 16:49:58 -07:00
Dane Springmeyer
e374ac70ae JOBS=6 for clang++, 2 for g++ 2014-07-24 16:09:53 -07:00
Dane Springmeyer
a10d69c1d8 try 4 cores 2014-07-24 15:46:51 -07:00
Dane Springmeyer
db4a2daf28 simplify travis config 2014-07-22 16:14:22 -07:00
Dane Springmeyer
1fed3e1f32 use latest harfbuzz 2014-07-22 14:35:20 -07:00
Dane Springmeyer
713a194315 [travis] drop to 2 JOBS / display cpu and free memory 2014-07-03 09:47:11 -07:00
artemp
89532d9903 Merge branch 'master' into refactor-markers
Conflicts:
	.travis.yml
2014-06-05 16:53:24 +01:00
Dane Springmeyer
147a289936 update travis script 2014-06-05 15:15:36 +01:00
Dane Springmeyer
c276e7dcac re-enable clang since #2235 should be fixed soon 2014-06-04 10:51:07 -07:00
Dane Springmeyer
39258e2cc2 update travis script 2014-06-04 09:31:20 -07:00
Dane Springmeyer
3bbcf7e927 travis: 5 crashed, back down to 4 jobs 2014-05-23 14:17:25 -07:00
Dane Springmeyer
3ff1d0d1e7 travis: 6 crashed, back down to 5 jobs 2014-05-23 14:08:14 -07:00
Dane Springmeyer
3ed6914c0f travis: try 6 jobs 2014-05-23 13:57:54 -07:00
Dane Springmeyer
2a60eead32 travis: try 4 jobs 2014-05-23 12:23:14 -07:00
Dane Springmeyer
c668890fb1 travis: try to nice g++ 2014-05-23 12:07:10 -07:00
Dane Springmeyer
6ef7b21107 travis: stop forcing JOBS=1 2014-05-23 10:34:21 -07:00
Dane Springmeyer
db325765c4 travis: another try to unbreak gdal/postgis 2014-05-23 09:02:43 -07:00
Dane Springmeyer
5e8618f97b travis: attempt to fix postgis install using method from https://github.com/OSGeo/gdal/blob/trunk/.travis.yml 2014-05-23 08:28:47 -07:00
Dane Springmeyer
e182d9f8c3 try to get gdal/ogr plugins building 2014-05-22 17:13:20 -07:00
Dane Springmeyer
b2d62d5fd9 travis: disable clang - refs #2235 2014-05-08 07:26:44 -07:00
Dane Springmeyer
88701b8669 revert usage of -flto on linux due to #2238 - refs #2232 2014-05-08 00:42:41 -07:00
Dane Springmeyer
e137985ecd travis: try -Os with -flto to see if #2235 and #2232 are still broken on travis 2014-05-06 23:00:42 -07:00
Dane Springmeyer
39737c5f1d Merge branch '2.3.x' of github.com:mapnik/mapnik
Conflicts:
	.travis.yml
	CHANGELOG.md
	bindings/python/build.py
	include/mapnik/feature_style_processor_context.hpp
	include/mapnik/feature_style_processor_impl.hpp
	include/mapnik/json/feature_collection_grammar.hpp
	include/mapnik/json/feature_collection_parser.hpp
	include/mapnik/json/feature_generator_grammar.hpp
	include/mapnik/json/feature_parser.hpp
	include/mapnik/json/geojson_generator.hpp
	include/mapnik/json/geometry_generator_grammar.hpp
	include/mapnik/json/geometry_parser.hpp
	plugins/input/gdal/gdal_featureset.cpp
	plugins/input/geojson/geojson_datasource.cpp
	plugins/input/occi/occi_featureset.cpp
	plugins/input/osm/osm_featureset.cpp
	plugins/input/postgis/build.py
	plugins/input/postgis/connection.hpp
	src/agg/agg_renderer.cpp
	src/build.py
	src/cairo_context.cpp
	src/datasource_cache.cpp
	src/grid/process_line_symbolizer.cpp
	src/grid/process_polygon_pattern_symbolizer.cpp
	src/grid/process_polygon_symbolizer.cpp
	src/grid/process_text_symbolizer.cpp
	src/json/feature_grammar.cpp
	tests/cpp_tests/fontset_runtime_test.cpp
	tests/visual_tests/images/collision-600-400-1.0-agg-reference.png
	tests/visual_tests/images/image-filters-multi-blur-512-512-1.0-agg-reference.png
	tests/visual_tests/images/image-filters-multi-blur-512-512-2.0-agg-reference.png
	tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-1.0-agg-reference.png
	tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-2.0-agg-reference.png
	tests/visual_tests/images/lines-1-400-400-2.0-agg-reference.png
	tests/visual_tests/images/lines-1-600-600-1.0-agg-reference.png
	tests/visual_tests/images/lines-1-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-2-200-200-1.0-agg-reference.png
	tests/visual_tests/images/lines-2-400-400-1.0-cairo-reference.png
	tests/visual_tests/images/lines-2-400-400-2.0-agg-reference.png
	tests/visual_tests/images/lines-2-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-2-800-800-2.0-agg-reference.png
	tests/visual_tests/images/lines-3-400-400-2.0-agg-reference.png
	tests/visual_tests/images/lines-3-600-600-1.0-agg-reference.png
	tests/visual_tests/images/lines-3-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-200-200-1.0-agg-reference.png
	tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-400-400-1.0-agg-reference.png
	tests/visual_tests/images/lines-6-600-600-1.0-agg-reference.png
	tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-800-800-1.0-agg-reference.png
	tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png
	tests/visual_tests/images/lines-shield-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-shield-600-600-2.0-cairo-reference.png
	tests/visual_tests/images/shield-on-polygon-600-400-1.0-agg-reference.png
	tests/visual_tests/images/shield-on-polygon-600-400-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-cairo-reference.png
	tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-agg-reference.png
	tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-agg-reference.png
	tests/visual_tests/test.py
2014-04-24 14:50:55 -07:00
Dane Springmeyer
015bb8d61f travis: fix syntax error 2014-04-09 09:22:38 -04:00
Dane Springmeyer
818e87dce4 update tests 2014-04-01 17:34:24 -07:00
Dane Springmeyer
7847c0a7b9 travis: start testing clang 2014-03-18 15:00:24 -07:00
Dane Springmeyer
f59dc36a19 attempt to workaround boost 1.49 bug when building in debug - refs #2085 2014-03-12 15:44:23 -07:00
Dane Springmeyer
42218b4bae try debug build - refs #2181 2014-03-12 15:02:00 -07:00
Dane Springmeyer
ad431baef2 travis: reduce email noise post policy change: http://about.travis-ci.org/blog/2013-11-19-upcoming-email-notification-policy-change/ 2013-12-03 09:01:16 -08:00
Dane Springmeyer
f123b84fd8 travis: target latest postgres 2013-12-03 08:46:35 -08:00
Dane Springmeyer
9a184d73a3 travis: abandon clang++ builds since travis appears unable to use upgraded clang (unlike stock precise) 2013-11-22 15:39:54 -08:00
Dane Springmeyer
e7b32d0899 travis: yes to apt 2013-11-22 13:47:50 -08:00
Dane Springmeyer
cb39896a1f travis: fix typo 2013-11-22 13:42:42 -08:00
Dane Springmeyer
6c63b56fe4 travis: upgrade llvm/clang++ to support c++11 2013-11-22 13:38:08 -08:00
Dane Springmeyer
1a99020e94 travis: fix typo in variable name 2013-11-22 13:04:17 -08:00
Dane Springmeyer
ff92370c37 travis: further partition c++ from python dependent tests 2013-11-22 12:35:14 -08:00
Dane Springmeyer
49dfa7486f travis: parallize tests: http://about.travis-ci.org/blog/2012-11-28-speeding-up-your-tests-by-parallelizing-them/ 2013-11-22 12:07:58 -08:00
Dane Springmeyer
37eaae3a51 travis: build harfbuzz on the fly 2013-11-22 00:52:49 -08:00
Dane Springmeyer
59a1eb1382 travis: pull gdal 2013-11-22 00:00:47 -08:00
Dane Springmeyer
821c1aae74 travis: build verbose 2013-11-21 23:54:56 -08:00
Dane Springmeyer
df3ad9e0f9 travis: run benchmarks 2013-11-19 12:33:44 -08:00
Dane Springmeyer
08cfc5d0f3 travis: test all branches 2013-11-07 09:05:49 -08:00
Dane Springmeyer
2e8c383730 travis: start testing on all branches again 2013-11-06 11:56:47 -08:00
Dane Springmeyer
8c9c277196 travis: use ubuntugis-unstable ppa for more recent gdal and proj4 - refs #2059 2013-10-31 12:33:32 -07:00
Dane Springmeyer
6513be924d travis: also install gdal-dev so the gdal and ogr plugins are built and tests are run 2013-10-31 11:43:13 -07:00
Dane Springmeyer
0d58a8aee4 merge with 2.3.x 2013-10-28 14:45:52 -07:00
Dane Springmeyer
fa6969a561 travis: start testing cairo+pycairo+sqlite+postgres 2013-10-28 13:19:33 -07:00
Dane Springmeyer
8c5b40a559 travis: restrict to only one job to avoid memory blowout 2013-10-23 16:14:09 -07:00
Dane Springmeyer
d5bacc39e2 installing g++-4.7 breaks clang, so disable for now 2013-10-01 09:26:14 -07:00
Dane Springmeyer
087cc9e2ae travis: start building python bindings again 2013-10-01 08:41:39 -07:00
Dane Springmeyer
c34c8a568f merge with branch 2.3.x 2013-09-30 13:33:28 -07:00
Dane Springmeyer
3175d29d27 travis: run tests 2013-09-26 20:31:26 -07:00
Dane Springmeyer
7d1496ee0e build 2.3.x branch on travis 2013-09-26 20:08:22 -07:00
Dane Springmeyer
806aa9d8a2 travis: attempt to use g++-47 2013-09-26 13:21:06 -07:00
Dane Springmeyer
093aab011b travis: set LD_LIBRARY_PATH before running c++ tests 2013-09-26 12:49:39 -07:00
Dane Springmeyer
5019bcb6c9 travis: remove trailing false 2013-09-26 12:48:09 -07:00
Dane Springmeyer
4494591502 built c++ tests and review config.log when configure fails 2013-09-25 21:44:47 -07:00
Dane Springmeyer
f0bebe5b10 iwyu 2013-09-25 21:35:25 -07:00
Dane Springmeyer
dc55b994ce skip python bindings for now, but run c++ tests 2013-09-25 21:32:04 -07:00
Dane Springmeyer
f2152c1d27 travis: start building plugins and use default optimization 2013-09-18 20:38:46 -07:00
Dane Springmeyer
5c157eae59 respect the CXX and CC environment variables 2013-08-22 20:37:30 -07:00
Dane Springmeyer
c83a5489c0 test both clang and gcc on travis 2013-08-22 20:30:36 -07:00
Dane Springmeyer
12a0f62761 add webp to travis - refs #1955 2013-07-19 12:23:29 -04:00
Dane Springmeyer
6ce9040915 limit to 2 concurrent jobs on travis 2013-03-11 11:53:56 -07:00
Dane Springmeyer
5c601a71b1 Add back python bindings to travis build now that compile times for the core lib have improved 2013-01-15 13:49:24 -08:00
Dane Springmeyer
8a5b906fc5 travis: only test master branch and move back to script section over install as timeouts seem to be allowed to be higher 2013-01-04 12:25:07 -08:00
Dane Springmeyer
da53e5e52a travis: much more minimal build to try again to get under 25 min compile time cutoff 2013-01-04 11:47:00 -08:00
Dane Springmeyer
6590225ce0 disable C++ tests for travis build to speed up overall compile 2012-12-19 20:12:13 -08:00
Dane Springmeyer
619cfbc1bc build less to reduce build time 2012-12-19 20:03:06 -08:00
Dane Springmeyer
3de5c4fab7 remove test target for travis for now 2012-10-03 13:49:56 -07:00
Dane Springmeyer
da8455dbb7 travis: do not fail on test return code 2012-10-03 13:01:53 -07:00
Axel Haustant
866256c01c Set JOBS=2 (best build time) 2012-09-04 16:30:43 +02:00
Axel Haustant
384ff45444 Do not install ccache and gain time on apt installations 2012-09-04 16:30:18 +02:00
Axel Haustant
15ecc6b7cd Do not use ccache 2012-09-04 11:01:11 +02:00
Axel Haustant
021f2939b6 Initial Travis CI configuration. 2012-09-02 16:19:11 +02:00