diff --git a/.drone.yml b/.drone.yml index dd2c1c2..4f1cb24 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,24 +33,6 @@ spec_step_common: &spec_step_common - dip rspec steps: - - name: Tests Ruby 2.2 - environment: - COMPOSE_FILE_EXT: drone - DOCKER_RUBY_VERSION: 2.2 - RUBY_IMAGE_TAG: 2.2-latest - REDIS_IMAGE_TAG: 4-alpine - RAILS_ENV: test - <<: *spec_step_common - - - name: Tests Ruby 2.3 - environment: - COMPOSE_FILE_EXT: drone - DOCKER_RUBY_VERSION: 2.3 - RUBY_IMAGE_TAG: 2.3-latest - REDIS_IMAGE_TAG: 4-alpine - RAILS_ENV: test - <<: *spec_step_common - - name: Tests Ruby 2.4 environment: COMPOSE_FILE_EXT: drone diff --git a/Appraisals b/Appraisals index 6e2b8f7..73840c3 100644 --- a/Appraisals +++ b/Appraisals @@ -1,17 +1,3 @@ -if RUBY_VERSION < '2.4' - appraise 'rails3.2' do - gem 'rails', '~> 3.2.0' - end - - appraise 'rails4.0' do - gem 'rails', '~> 4.0.13' - end - - appraise 'rails4.1' do - gem 'rails', '~> 4.1.16' - end -end - appraise 'rails4.2' do gem 'rails', '~> 4.2.9' end @@ -26,5 +12,4 @@ end appraise 'rails5.2' do gem 'rails', '~> 5.2.0', '< 5.2.4.1' - gem 'mimemagic', '<= 0.3.9' if RUBY_VERSION < '2.3' end diff --git a/dip.yml b/dip.yml index 35d1ff5..42db444 100644 --- a/dip.yml +++ b/dip.yml @@ -1,8 +1,8 @@ version: '1' environment: - DOCKER_RUBY_VERSION: 2.3 - RUBY_IMAGE_TAG: 2.3-latest + DOCKER_RUBY_VERSION: 2.4 + RUBY_IMAGE_TAG: 2.4-latest REDIS_IMAGE_TAG: 4-alpine COMPOSE_FILE_EXT: development RAILS_ENV: test @@ -40,6 +40,5 @@ interaction: provision: - docker volume create --name bundler_data - dip bundle config --local https://gems.railsc.ru/ ${APRESS_GEMS_CREDENTIALS} - - dip clean - dip bundle install - dip appraisal install