From 8be08434671079edaabac2f2e7efcb720a4bd8be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Wed, 26 Dec 2018 06:39:17 +0100 Subject: Bump cld3 from 3.2.2 to 3.2.3 (#9632) Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.2 to 3.2.3. - [Release notes](https://github.com/akihikodaki/cld3-ruby/releases) - [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.2...v3.2.3) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 3d78b1dfe..3ab8cad1c 100644 --- a/Gemfile +++ b/Gemfile @@ -29,7 +29,7 @@ gem 'browser' gem 'charlock_holmes', '~> 0.7.6' gem 'iso-639' gem 'chewy', '~> 5.0' -gem 'cld3', '~> 3.2.0' +gem 'cld3', '~> 3.2.3' gem 'devise', '~> 4.5' gem 'devise-two-factor', '~> 3.0' -- cgit From 17cd443b374bb2170fc4f4837b1922c8025c861a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Thu, 27 Dec 2018 12:23:27 +0100 Subject: Bump webmock from 3.4.2 to 3.5.1 (#9641) Bumps [webmock](https://github.com/bblimke/webmock) from 3.4.2 to 3.5.1. - [Release notes](https://github.com/bblimke/webmock/releases) - [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md) - [Commits](https://github.com/bblimke/webmock/compare/v3.4.2...v3.5.1) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 3ab8cad1c..bd0ff0967 100644 --- a/Gemfile +++ b/Gemfile @@ -114,7 +114,7 @@ group :test do gem 'rails-controller-testing', '~> 1.0' gem 'rspec-sidekiq', '~> 3.0' gem 'simplecov', '~> 0.16', require: false - gem 'webmock', '~> 3.4' + gem 'webmock', '~> 3.5' gem 'parallel_tests', '~> 2.27' end diff --git a/Gemfile.lock b/Gemfile.lock index faf63cff1..3caefbb99 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -629,7 +629,7 @@ GEM uniform_notifier (1.12.1) warden (1.2.7) rack (>= 1.0) - webmock (3.4.2) + webmock (3.5.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff @@ -763,7 +763,7 @@ DEPENDENCIES tty-prompt (~> 0.18) twitter-text (~> 1.14) tzinfo-data (~> 1.2018) - webmock (~> 3.4) + webmock (~> 3.5) webpacker (~> 3.5) webpush -- cgit From 29484f655596158bbbb6fcd493b28d7f990116e8 Mon Sep 17 00:00:00 2001 From: ashleyhull-versent Date: Sat, 29 Dec 2018 17:23:07 +1100 Subject: Replace Ruby 2.3 with 2.6 in CircleCI (#9652) * Update config.yml * Update Gemfile * dropping ruby 2.3 2.3 EOL date: scheduled for 2019-03-31 * Updating docker containers * Update Gemfile --- .circleci/config.yml | 54 ++++++++++++++++++++++++++-------------------------- Gemfile | 2 +- 2 files changed, 28 insertions(+), 28 deletions(-) (limited to 'Gemfile') diff --git a/.circleci/config.yml b/.circleci/config.yml index 1161e4076..3ecea5c9e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 aliases: - &defaults docker: - - image: circleci/ruby:2.5.1-stretch-node + - image: circleci/ruby:2.6.0-stretch-node environment: &ruby_environment BUNDLE_APP_CONFIG: ./.bundle/ DB_HOST: localhost @@ -98,21 +98,21 @@ jobs: <<: *defaults <<: *install_steps - install-ruby2.5: + install-ruby2.6: <<: *defaults <<: *install_ruby_dependencies - install-ruby2.4: + install-ruby2.5: <<: *defaults docker: - - image: circleci/ruby:2.4.4-stretch-node + - image: circleci/ruby:2.5.3-stretch-node environment: *ruby_environment <<: *install_ruby_dependencies - install-ruby2.3: + install-ruby2.4: <<: *defaults docker: - - image: circleci/ruby:2.3.7-stretch-node + - image: circleci/ruby:2.4.5-stretch-node environment: *ruby_environment <<: *install_ruby_dependencies @@ -128,43 +128,43 @@ jobs: - ./mastodon/public/assets - ./mastodon/public/packs-test/ - test-ruby2.5: + test-ruby2.6: <<: *defaults docker: - - image: circleci/ruby:2.5.1-stretch-node + - image: circleci/ruby:2.6.0-stretch-node environment: *ruby_environment - - image: circleci/postgres:10.3-alpine + - image: circleci/postgres:10.6-alpine environment: POSTGRES_USER: root - - image: circleci/redis:4.0.9-alpine + - image: circleci/redis:5.0.3-alpine3.8 <<: *test_steps - test-ruby2.4: + test-ruby2.5: <<: *defaults docker: - - image: circleci/ruby:2.4.4-stretch-node + - image: circleci/ruby:2.5.3-stretch-node environment: *ruby_environment - - image: circleci/postgres:10.3-alpine + - image: circleci/postgres:10.6-alpine environment: POSTGRES_USER: root - - image: circleci/redis:4.0.9-alpine + - image: circleci/redis:4.0.12-alpine <<: *test_steps - test-ruby2.3: + test-ruby2.4: <<: *defaults docker: - - image: circleci/ruby:2.3.7-stretch-node + - image: circleci/ruby:2.4.5-stretch-node environment: *ruby_environment - - image: circleci/postgres:10.3-alpine + - image: circleci/postgres:10.6-alpine environment: POSTGRES_USER: root - - image: circleci/redis:4.0.9-alpine + - image: circleci/redis:4.0.12-alpine <<: *test_steps test-webui: <<: *defaults docker: - - image: circleci/node:8.11.1-stretch + - image: circleci/node:8.15.0-stretch steps: - *attach_workspace - run: ./bin/retry yarn test:jest @@ -183,20 +183,24 @@ workflows: build-and-test: jobs: - install - - install-ruby2.5: + - install-ruby2.6: requires: - install - - install-ruby2.4: + - install-ruby2.5 + - install-ruby2.5: requires: - install - - install-ruby2.5 - - install-ruby2.3: + - install-ruby2.4: requires: - install - install-ruby2.5 - build: requires: - install-ruby2.5 + - test-ruby2.6: + requires: + - install-ruby2.6 + - build - test-ruby2.5: requires: - install-ruby2.5 @@ -205,10 +209,6 @@ workflows: requires: - install-ruby2.4 - build - - test-ruby2.3: - requires: - - install-ruby2.3 - - build - test-webui: requires: - install diff --git a/Gemfile b/Gemfile index bd0ff0967..ceef9d551 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ # frozen_string_literal: true source 'https://rubygems.org' -ruby '>= 2.3.0', '< 2.6.0' +ruby '>= 2.4.0', '< 2.7.0' gem 'pkg-config', '~> 1.3' -- cgit