Commit graph

200 commits

Author SHA1 Message Date
Dane Springmeyer
0ec4d3101c travis: try doubling jobs 2015-01-27 15:21:40 -08:00
Dane Springmeyer
1b771593b5 travis: fix bash syntax 2015-01-26 23:07:44 -08:00
Dane Springmeyer
ca59ed1cd6 travis/osx: put bash on PATH 2015-01-26 23:02:04 -08:00
Dane Springmeyer
dbea56621f travis: upgrade bash on osx / restore make 2015-01-26 22:53:34 -08:00
Dane Springmeyer
8c7a9aed18 travis: postgres is not viable on osx 2015-01-26 22:47:58 -08:00
Dane Springmeyer
b9ef27c221 travis: re-expand matrix 2015-01-26 22:39:52 -08:00
Dane Springmeyer
3e8b701194 bootstrap cleanups 2015-01-24 10:05:58 -08:00
Dane Springmeyer
e26132cf9f travis cleanup 2015-01-23 23:51:54 -08:00
Dane Springmeyer
1a28cf763f use clang 2015-01-23 23:05:41 -08:00
Dane Springmeyer
3ba834109a debug configure fail 2015-01-23 23:01:08 -08:00
Dane Springmeyer
be1690d5c7 try sudoless clang upgrade 2015-01-23 22:57:45 -08:00
Dane Springmeyer
e53f4e8637 sudoless 2015-01-23 14:21:54 -08:00
Dane Springmeyer
34b685db40 travis: try bootstraping deps with mason 2015-01-23 14:04:41 -08:00
Dane Springmeyer
1ed2b29f0a travis: test PLUGIN_LINKING=static 2014-11-11 15:27:29 -08:00
Dane Springmeyer
c3dbd83348 try running benchmarks on travis again 2014-10-23 16:16:51 -07:00
Dane Springmeyer
036a3bb14f only report git metadata for git checkout builds 2014-10-23 00:42:10 -07:00
Dane Springmeyer
a00c56f40c travis cannot cope with debug builds 2014-10-21 20:24:11 -07:00
Dane Springmeyer
241c2ebf0b try gcc too 2014-10-21 16:54:53 -07:00
Dane Springmeyer
27c959b1bf quiet use of mapnik-test-data 2014-10-20 22:43:17 -07:00
Dane Springmeyer
98794accb4 travis: run all visual tests using threaded load 2014-10-08 14:25:42 -07:00
Dane Springmeyer
4ec3b5d013 travis: use harfbuzz from fontforge ppa 2014-10-02 11:27:59 -07:00
Dane Springmeyer
68fba05f5e try testing against boost 1.48 again - refs #2469 #2471 2014-10-02 10:32:16 -07:00
Dane Springmeyer
d09765ad08 travis: give up and just do clang++/release 2014-09-30 21:54:20 -07:00
Dane Springmeyer
0cf9498d21 travis: is there hope? 2014-09-30 21:40:10 -07:00
Dane Springmeyer
548f30b81f travis: try JOBS=4 for gcc 2014-09-30 21:24:43 -07:00
Dane Springmeyer
babffe08fb travis: fix Debug comparision 2014-09-30 19:39:52 -07:00
Dane Springmeyer
e55e606025 Travis: debug JOBS in DEBUG mode 2014-09-30 19:19:25 -07:00
Dane Springmeyer
7e8275a283 travis: tune JOBS 2014-09-30 19:08:26 -07:00
Dane Springmeyer
eda8c3336b travis: fix typo 2014-09-30 18:50:26 -07:00
Dane Springmeyer
d4f7c2ae49 travis use boost 1.55 over 1.48 to dodge for now #2469 and #2471 2014-09-30 18:47:41 -07:00
Dane Springmeyer
e392feeec2 re-enable gcc, more JOBS, less boost 2014-09-30 17:05:34 -07:00
Dane Springmeyer
9cba3a2036 travis: try more aggressive JOBS again - refs #2439 2014-09-30 14:52:50 -07:00
Dane Springmeyer
092e2c0913 travis: use harfbuzz v0.9.35 2014-09-30 08:58:33 -07:00
Dane Springmeyer
74b33d3042 back to 2 JOBS 2014-09-24 16:00:27 -07:00
Dane Springmeyer
491a8b5006 travis: test JOBS=1 2014-09-18 15:49:14 -07:00
Dane Springmeyer
c0f8dd8d47 travis: fewer jobs to try to work around oom 2014-09-11 13:30:48 -07:00
Dane Springmeyer
edbc972de7 Revert "travis: try increasing swap"
This reverts commit e95d863fd4.
2014-09-11 13:30:15 -07:00
Dane Springmeyer
e95d863fd4 travis: try increasing swap 2014-09-11 10:45:05 -07:00
Dane Springmeyer
27fbd2dcbe add https://github.com/mapbox/mapnik-test-data to tests - /cc @GretaCB 2014-09-02 11:55:09 -07:00
Dane Springmeyer
45aa09b9bd travis: less JOBS in debug mode [skip ci] 2014-08-22 14:25:27 -07:00
Dane Springmeyer
601ac60c87 travis: fix order of ops 2014-08-21 17:01:51 -07:00
Dane Springmeyer
a85312179c travis: add back libstdc++ upgrade for c++11 support 2014-08-21 16:55:55 -07:00
Dane Springmeyer
5e8efd75d3 port travis fixes from #2380 to master 2014-08-21 16:36:55 -07:00
Dane Springmeyer
1e19ca2103 travis: drop removal of postgis 2014-08-18 21:36:36 -07:00
Dane Springmeyer
51baf411c3 travis: give up on gdal 2014-08-18 21:32:59 -07:00
Dane Springmeyer
bc9102da82 travis: yet another try to keep postgis installed 2014-08-18 21:19:18 -07:00
Dane Springmeyer
c8def83cd5 travis: debug postgis 2014-08-18 21:10:21 -07:00
Dane Springmeyer
b86d063bf0 travis: another try at gdal 2014-08-18 20:39:37 -07:00
Dane Springmeyer
5e379fc00f travis: alt gdal approach 2014-08-18 20:33:14 -07:00
Dane Springmeyer
ed568fcc2a attempt to repair postgres install 2014-08-18 20:14:50 -07:00
Dane Springmeyer
58d9520c34 Travis: remove lto testing code 2014-08-18 20:11:29 -07:00
Dane Springmeyer
c1bceffb45 Travis: drop concurrent jobs for clang 2014-08-18 15:36:54 -07:00
Dane Springmeyer
bbeb9fb631 disable font test until #2341 is fixed [skip ci] 2014-08-11 12:31:24 -07:00
Dane Springmeyer
4054b97984 fix font testing 2014-08-10 20:56:13 -07:00
Dane Springmeyer
48078da22d debug font crash - refs #2341 2014-08-10 20:35:23 -07:00
Dane Springmeyer
b0392ff002 travis: fix benchmark run logic [skip ci] 2014-08-09 14:01:28 -07:00
Dane Springmeyer
bcc92c9693 Travis: disable notifications + only run bench when built 2014-08-09 13:46:13 -07:00
Dane Springmeyer
fc70ab6c0a test a crazy matrix 2014-08-08 15:01:35 -07:00
Dane Springmeyer
3d8a6714a1 travis: re-enable python bindings 2014-08-06 23:16:37 -07:00
Dane Springmeyer
f711cac261 travis: attempt to workaround ar lto bug 2014-08-06 22:42:56 -07:00
Dane Springmeyer
ae716e7690 travis: disable RANLIB 2014-08-06 21:34:21 -07:00
Dane Springmeyer
67f564b980 travis: install harfbuzz in /usr/lib since gold linker ignores LD_LIBRARY_PATH 2014-08-06 20:20:57 -07:00
Dane Springmeyer
5f6602681c travis: gold linker needs to be told to see in /usr/local/lib 2014-08-06 20:16:12 -07:00
Dane Springmeyer
f34743918d travis: put custom installed clang-3.4 on path 2014-08-06 20:09:07 -07:00
Dane Springmeyer
04d2482061 further attempt at lto with clang 2014-08-06 20:03:02 -07:00
Dane Springmeyer
0ac4fdcad6 travis: debug failed configure 2014-08-06 19:33:41 -07:00
Dane Springmeyer
66f0e6b016 travis: also install libstdc++-dev 2014-08-06 19:24:40 -07:00
Dane Springmeyer
103b5bf6d5 travis: try building with -flto 2014-08-06 19:14:31 -07:00
Dane Springmeyer
0c2e1d6166 travis: give up on gcc (too often killed by travis oom) 2014-08-05 13:10:56 -07:00
Dane Springmeyer
a7e864b918 travis: drop jobs slightly given recent killed processes 2014-08-04 16:10:55 -07:00
Dane Springmeyer
0da6098b35 travis: try full path to clang++ to work around broken libtool/ linking of libharfbuzz-icu 2014-08-04 10:36:43 -07:00
Dane Springmeyer
a865a47cb5 travis: debug broken clang++ build with harfbuzz 2014-08-04 10:24:27 -07:00
Dane Springmeyer
a8c6c5d71e travis: upgrade harfbuzz to 0.9.34 2014-08-04 10:06:57 -07:00
Dane Springmeyer
8b2243336b travis: attempt to fix gdal build with trick from naturalatlas/node-gdal#58 2014-07-31 20:19:06 -07:00
Dane Springmeyer
f5c9100ca2 travis: disable gdal install 2014-07-30 13:10:27 -07:00
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