Commit Graph

179 Commits

Author SHA1 Message Date
Leith Bade
6fecb80405 Go back to 7z NDK 2014-12-09 22:44:12 +11:00
Leith Bade
2967bd85e4 Fix path to NDK 2014-12-09 22:41:59 +11:00
Leith Bade
d6983dd1b1 sudo dunp 2014-12-09 09:59:25 +11:00
Leith Bade
8b1a2679e6 Dump running services. 2014-12-09 09:13:09 +11:00
Leith Bade
d8b7bc7235 Always update before install 2014-12-09 08:34:20 +11:00
Leith Bade
f2776c0854 Try NDK install via git clone 2014-12-06 15:48:49 +11:00
Leith Bade
35e3f55f56 Revert "Try tar.gz NDK"
This reverts commit 08c4ebc3bb.

Conflicts:
	scripts/travis_before_install.sh
2014-12-06 15:06:51 +11:00
Leith Bade
cb32f26bce Fix typo 2014-12-06 06:51:36 +11:00
Leith Bade
08c4ebc3bb Try tar.gz NDK 2014-12-06 06:39:34 +11:00
Leith Bade
c817e476f3 Revert "Fix travis again x6"
This reverts commit 58833dd56a.
2014-12-04 08:38:02 +11:00
Leith Bade
58833dd56a Fix travis again x6 2014-12-04 02:56:39 +11:00
Leith Bade
ae98eeb85d Fix travis again x5 2014-12-04 02:43:06 +11:00
Leith Bade
ef94bec2f3 Fix travis again x4 2014-12-04 02:12:11 +11:00
Leith Bade
886e21f755 Fix travis again x3 2014-12-04 01:57:12 +11:00
Leith Bade
243fb1de2d Fix travis again x2 2014-12-04 01:35:52 +11:00
Leith Bade
4187ccc381 Fix travis again 2014-12-04 01:27:52 +11:00
Leith Bade
34aeae2455 Fix travis 2014-12-04 01:22:17 +11:00
Leith Bade
2e30623bbc Restore travis timing 2014-12-03 20:51:37 +11:00
Leith Bade
160c262b6e Fix set -e 2014-12-03 20:49:11 +11:00
Leith Bade
1bffbb0908 Use TESTMUNK in travis to start Testmunk 2014-12-03 19:46:35 +11:00
Leith Bade
fdc8bb5221 Remove cat 2014-11-30 13:11:56 +11:00
Leith Bade
164596d0cb Fix access key for android on travis 2014-11-30 12:46:44 +11:00
Leith Bade
cbbcbd3c8d Debug access keys on travis 2014-11-30 12:28:27 +11:00
Leith Bade
8c4d1e4d80 Fix access token on travis 2014-11-28 00:19:11 +11:00
artemp
3193d97efe Revert "remove travis default installed libs which might conflict"
This reverts commit 23d3588f50.
2014-11-28 00:15:04 +11:00
artemp
ecd7826588 remove travis default installed libs which might conflict 2014-11-28 00:15:02 +11:00
Leith Bade
8c5be67f14 Install jq on travis 2014-11-23 12:26:28 +11:00
Leith Bade
077fa810d6 Fix testmunk travis 2014-11-23 08:13:40 +11:00
Leith Bade
a438459e3b Rewrite EGL config choosing 2014-11-22 21:40:49 +11:00
Leith Bade
67f2996fbc Fix testmunk 2014-11-22 20:51:59 +11:00
Leith Bade
fd3077bc7c Improve upload testmunk script 2014-11-22 18:37:29 +11:00
Leith Bade
ad27e0f2e2 Only run one android build till figure out how to filter in testmunk script 2014-11-22 17:11:36 +11:00
Leith Bade
08d11b23a8 Use testmunk in travis 2014-11-22 16:58:39 +11:00
Leith Bade
5b718d7fc9 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	ios/mapbox-gl-cocoa
2014-11-21 20:36:55 +11:00
John Firebaugh
545292b6f9 Fix OS X build 2014-11-20 15:55:16 -08:00
Leith Bade
bd9d7fe776 Forgot osx 2014-11-15 19:55:26 +11:00
Leith Bade
6f78ec8a70 Give Travis latest build tools 2014-11-15 19:37:41 +11:00
Leith Bade
1a7b9a1669 Make Travis load submodules in init 2014-11-15 11:38:06 +11:00
Leith Bade
25251ee634 Fix sdk path on travis 2014-11-09 09:49:04 +11:00
Leith Bade
50431652c8 More tweaks to osx android on travis 2014-11-09 09:46:29 +11:00
Leith Bade
9f74c79c7d First attempt at osx android in travis 2014-11-09 09:37:04 +11:00
Leith Bade
529af6de24 Fix travis 2014-11-08 16:53:55 +11:00
Leith Bade
7b290b09c8 Add missing platform to travis 2014-11-06 23:35:08 +11:00
Leith Bade
b1bfbbcc8f Fix aapt issue 2014-11-06 08:58:57 +11:00
Leith Bade
cbe4df9685 Find with full path 2014-11-06 08:43:17 +11:00
Leith Bade
5a97eb3888 Be more specific with find 2014-11-06 08:28:07 +11:00
Leith Bade
f353b5ba55 Add find for travis debug 2014-11-06 07:44:22 +11:00
Leith Bade
aebd3fdca5 Install android sdk 2014-11-06 01:22:40 +11:00
Leith Bade
18d5501279 Add java to build 2014-11-06 00:51:08 +11:00
Leith Bade
4dc66ad8b9 Fix typo 2014-11-05 23:18:19 +11:00