Commit graph

59 commits

Author SHA1 Message Date
Thomas Reynolds fdabd87957 merge in fixes from stable 2015-09-17 13:53:43 -07:00
Thomas Reynolds ed405b266f bump target ruby version 2015-09-14 17:46:12 -07:00
Thomas Reynolds 7a28fd0a50 disable osx builds for now 2015-08-31 11:25:22 -07:00
Thomas Reynolds c69099c451 Really fix #1568 2015-07-24 13:46:33 -07:00
Thomas Reynolds 3e46e8139f Add osx build env 2015-06-09 10:17:47 -07:00
Thomas Reynolds 973f79a103 Dropping ruby 1.9.x support 2015-02-23 12:29:51 -08:00
Thomas Reynolds ddc048e075 swap rbx for another jruby 2015-01-04 16:10:58 -06:00
Thomas Reynolds 8e743aea94 fix interactive init test 2015-01-04 15:06:14 -06:00
Thomas Reynolds 96e05128a1 attempt to improve travis perf 2015-01-04 14:42:06 -06:00
Thomas Reynolds d8e8b06cb6 merge v3 2014-11-19 09:04:56 -08:00
Ryunosuke SATO 1142630dc8 Test against Ruby 2.2.0 on Travis CI 2014-10-09 00:30:35 +09:00
Thomas Reynolds e28850c9d7 slim down travis 2014-08-24 19:06:31 -07:00
Thomas Reynolds 434d55b1ae See if code climate hooks work 2014-06-20 14:09:51 -07:00
Thomas Reynolds 4b53549ae4 Merge in recent changes from v3-stable 2014-04-08 09:27:18 -07:00
Thomas Reynolds 28e39933e8 Notify slack 2014-04-03 14:48:30 -07:00
Ben Hollis 60f712e6ba Merge branch 'v3-stable'
Conflicts:
	.travis.yml
	Gemfile
	middleman-cli/lib/middleman-cli/build.rb
	middleman-core/lib/middleman-core/core_extensions/file_watcher.rb
	middleman-core/lib/middleman-core/templates.rb
	middleman-core/lib/middleman-core/util.rb
	middleman-core/middleman-core.gemspec
2014-03-25 22:35:19 -07:00
Karl Freeman c1ef5fc2bf refresh travis
- indicate that we're keen on caching
- test against a larger variety of ruby interpreters however, lets allow some failures
- not allow 2.1 to fail?
2014-03-25 08:35:33 +00:00
Arthur Neves 8eb544a3e7 Travis ci update
Test on 2.1.1
Dont allow failures on 2.1.x
2014-03-17 00:18:48 -04:00
Thomas Reynolds 305d2f99ed Put template rendering in a jail 2014-01-02 16:05:39 -08:00
Thomas Reynolds b5fec39df8 2.1 is for reals now 2014-01-01 15:00:56 -08:00
Karl Freeman f6f235c1fe exclude development gems 2013-12-29 22:53:18 +00:00
Karl Freeman b0a5722b34 use latest bundler 2013-12-29 22:45:43 +00:00
Karl Freeman 1de2f5c290 TRAVIS environment variable already set
http://about.travis-ci.org/docs/user/ci-environment/#Environment-variables
2013-12-29 13:01:33 +00:00
Karl Freeman b1c0d73259 fast failures and Ruby 2.1 / head testing 2013-12-28 01:31:32 +00:00
Thomas Reynolds ca4935361b drop Ruby 1.8, add some extra tests 2013-10-29 09:43:56 -07:00
Thomas Reynolds 7beb27800b temp disable jruby tests 2013-09-27 23:56:37 -07:00
Thomas Reynolds f97c9ffab1 dont bother with jruby 1.8 mode 2013-06-12 18:24:00 -07:00
Thomas Reynolds 77157b96e0 jruby isn't optional 2013-05-23 15:04:05 -07:00
Thomas Reynolds 58e288abdc drop 1.9.2 testing support 2013-04-20 17:39:16 -07:00
Ben Hollis 4745418200 Merge remote-tracking branch 'origin/3.0-stable'
Conflicts:
	.travis.yml
	Gemfile
	middleman-core/lib/middleman-core/version.rb
	middleman-core/middleman-core-x86-mingw32.gemspec
	middleman-core/middleman-core.gemspec
2013-03-02 22:32:03 -08:00
Thomas Reynolds 6cee2d74f5 adapt to bundler changes, add ruby 2.0 to tests, prep release 2013-02-24 13:44:24 -08:00
Ben Hollis 1d3503b56c OK maybe not Rubinius 2013-02-15 23:00:53 -08:00
Ben Hollis 00f23cad8e Test on more rubies 2013-02-15 22:15:13 -08:00
Thomas Reynolds 6791dc431c Let travis know we're using submodules 2012-07-02 21:43:17 -07:00
Thomas Reynolds bd9d9d0f93 travishatesme 2012-06-18 16:53:22 -07:00
Thomas Reynolds 4ea2f6f7ed Sick of jruby breaking travis 2012-06-17 11:42:39 -07:00
Thomas Reynolds bb659bb5be jruby 1.9 fixed itself? 2012-05-24 11:33:51 -07:00
Thomas Reynolds 1022e63cee Avoid bundler on travis 2012-05-10 16:32:43 -07:00
Thomas Reynolds ed50d4326a Try to avoid running bundler in tests on Travis 2012-05-10 16:07:11 -07:00
Thomas Reynolds 3f048011ab Stop testing on Rubinius 2012-05-10 11:25:21 -07:00
Thomas Reynolds d1d59ca5ca always test jruby now 2012-05-03 15:41:07 -07:00
Thomas Reynolds 527c987281 Attempt to avoid redcarpet tests on jruby 2012-05-02 16:28:04 -07:00
Thomas Reynolds c8e79f5755 test rbx 2012-04-26 13:47:07 -07:00
Thomas Reynolds a13db4f16e derp only allow compass 0.12 2012-03-14 20:04:29 -07:00
Thomas Reynolds 7d2821a472 travis update 2012-03-14 20:02:49 -07:00
Thomas Reynolds 576463f361 fix merge 2012-03-01 13:24:56 -08:00
Thomas Reynolds 5b2381f6eb sorry jruby 2012-02-18 10:04:28 -08:00
Thomas Reynolds 3cabbcf5a4 test jruby 2012-02-18 09:02:16 -08:00
Thomas Reynolds ceb5f53d57 enable jruby 2012-01-30 10:10:38 -08:00
Thomas Reynolds 73913f0ace Start getting middleman-more tests passing. About 50% done 2011-12-29 19:04:39 -08:00