diff --git a/.gitignore b/.gitignore index 2b276861..366534de 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ doc/app /.rvmrc* /*.iml /.idea +.rbx diff --git a/.travis.yml b/.travis.yml index 87359bb3..cd39a758 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ rvm: - 1.8.7 - 1.9.2 - 1.9.3 + - rbx-18mode env: - "RAILS_ENV=test DB=mysql BUNDLE_WITHOUT=rmagick:mysql2:postgres:sqlite" - "RAILS_ENV=test DB=mysql2 BUNDLE_WITHOUT=rmagick:mysql:postgres:sqlite" @@ -14,6 +15,10 @@ matrix: env: "RAILS_ENV=test DB=mysql BUNDLE_WITHOUT=rmagick:mysql2:postgres:sqlite" - rvm: 1.9.3 env: "RAILS_ENV=test DB=mysql BUNDLE_WITHOUT=rmagick:mysql2:postgres:sqlite" + - rvm: rbx-18mode + env: "RAILS_ENV=test DB=mysql BUNDLE_WITHOUT=rmagick:mysql2:postgres:sqlite" + allow_failures: + - rvm: rbx-18mode before_script: - "sudo apt-get --no-install-recommends install bzr cvs darcs git mercurial subversion" - "rake ci:travis:prepare" diff --git a/Gemfile b/Gemfile index f6c804d1..9b93963b 100644 --- a/Gemfile +++ b/Gemfile @@ -54,7 +54,7 @@ end # orders of magnitude compared to their native counterparts. You have been # warned. -platforms :mri, :mingw do +platforms :mri, :mingw, :rbx do group :mysql2 do gem "mysql2", "~> 0.2.7" end @@ -76,7 +76,7 @@ platforms :mri_18, :mingw_18 do end end -platforms :mri_19, :mingw_19 do +platforms :mri_19, :mingw_19, :rbx do group :sqlite do gem "sqlite3" end