From ca12c539fb9f4b29c1822f3c90dce34d9430e312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marwan=20Rabb=C3=A2a?= Date: Mon, 19 Jul 2021 15:30:07 +0200 Subject: [PATCH 1/5] add ci --- .github/workflows/ci.yml | 1 + gemfiles/rails_6.1.gemfile | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 gemfiles/rails_6.1.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0791720f..8e7dbce2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,6 +32,7 @@ jobs: gemfile: - Gemfile - gemfiles/rails_edge.gemfile # 7.1.0.alpha + - gemfiles/rails_6.1.gemfile - gemfiles/rails_6.0.gemfile - gemfiles/rails_5.2.gemfile diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile new file mode 100644 index 00000000..2ff0e32b --- /dev/null +++ b/gemfiles/rails_6.1.gemfile @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +source 'https://rubygems.org' + +# Specify your gem's dependencies in lograge.gemspec +gemspec path: '..' + +group :test do + gem 'actionpack', '~> 6.0.0' + gem 'activerecord', '~> 6.0.0' + # logstash does not release any gems on rubygems, but they have two gemspecs within their repo. + # Using the tag is an attempt of having a stable version to test against where we can ensure that + # we test against the correct code. + gem 'logstash-event', git: 'https://github.com/elastic/logstash', tag: 'v1.5.4' + # logstash 1.5.4 is only supported with jrjackson up to 0.2.9 + gem 'jrjackson', '~> 0.2.9', platforms: :jruby + gem 'lines' +end From aa45aa389424af83df6957aeb589419e1d8e5c5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marwan=20Rabb=C3=A2a?= Date: Mon, 19 Jul 2021 16:32:03 +0200 Subject: [PATCH 2/5] add rails6.1 gemfile --- gemfiles/Gemfile.actionpack6.1 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 gemfiles/Gemfile.actionpack6.1 diff --git a/gemfiles/Gemfile.actionpack6.1 b/gemfiles/Gemfile.actionpack6.1 new file mode 100644 index 00000000..dbb6c0d1 --- /dev/null +++ b/gemfiles/Gemfile.actionpack6.1 @@ -0,0 +1,16 @@ +source 'https://rubygems.org' + +# Specify your gem's dependencies in lograge.gemspec +gemspec path: '..' + +group :test do + gem 'activerecord', '~> 6.1.0' + gem 'actionpack', '~> 6.1.0' + + # logstash does not release any gems on rubygems, but they have two gemspecs within their repo. + # Using the tag is an attempt of having a stable version to test against where we can ensure that + # we test against the correct code. + gem 'logstash-event', git: 'https://github.com/elastic/logstash', tag: 'v1.5.4' + gem 'jrjackson', '~> 0.2.9', platforms: :jruby + gem 'lines' +end From 37ccb3bf5c7f173380d43e68f151d61d8919e4a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marwan=20Rabb=C3=A2a?= Date: Wed, 8 Dec 2021 11:29:41 +0100 Subject: [PATCH 3/5] typo --- gemfiles/Gemfile.actionpack6.1 | 16 ---------------- gemfiles/rails_6.1.gemfile | 4 ++-- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 gemfiles/Gemfile.actionpack6.1 diff --git a/gemfiles/Gemfile.actionpack6.1 b/gemfiles/Gemfile.actionpack6.1 deleted file mode 100644 index dbb6c0d1..00000000 --- a/gemfiles/Gemfile.actionpack6.1 +++ /dev/null @@ -1,16 +0,0 @@ -source 'https://rubygems.org' - -# Specify your gem's dependencies in lograge.gemspec -gemspec path: '..' - -group :test do - gem 'activerecord', '~> 6.1.0' - gem 'actionpack', '~> 6.1.0' - - # logstash does not release any gems on rubygems, but they have two gemspecs within their repo. - # Using the tag is an attempt of having a stable version to test against where we can ensure that - # we test against the correct code. - gem 'logstash-event', git: 'https://github.com/elastic/logstash', tag: 'v1.5.4' - gem 'jrjackson', '~> 0.2.9', platforms: :jruby - gem 'lines' -end diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index 2ff0e32b..e2a01480 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -6,8 +6,8 @@ source 'https://rubygems.org' gemspec path: '..' group :test do - gem 'actionpack', '~> 6.0.0' - gem 'activerecord', '~> 6.0.0' + gem 'actionpack', '~> 6.1.0' + gem 'activerecord', '~> 6.1.0' # logstash does not release any gems on rubygems, but they have two gemspecs within their repo. # Using the tag is an attempt of having a stable version to test against where we can ensure that # we test against the correct code. From 529b5ae7e1da6b553ab64b08cc3667fc81d2342c Mon Sep 17 00:00:00 2001 From: Marwan Date: Wed, 29 Jun 2022 20:52:26 +0200 Subject: [PATCH 4/5] add thread_safe for rails 6.1 --- gemfiles/rails_6.1.gemfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index e2a01480..db27e4bb 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -11,8 +11,9 @@ group :test do # logstash does not release any gems on rubygems, but they have two gemspecs within their repo. # Using the tag is an attempt of having a stable version to test against where we can ensure that # we test against the correct code. - gem 'logstash-event', git: 'https://github.com/elastic/logstash', tag: 'v1.5.4' + gem 'logstash-event', git: 'https://github.com/elastic/logstash', tag: 'v1.5.6' # logstash 1.5.4 is only supported with jrjackson up to 0.2.9 gem 'jrjackson', '~> 0.2.9', platforms: :jruby gem 'lines' + gem 'thread_safe' end From 49804a32b7094ce3bedeef817e53c46d0f99ebd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marwan=20Rabb=C3=A2a?= Date: Mon, 4 Jul 2022 09:17:04 +0200 Subject: [PATCH 5/5] bump logstach event version Co-authored-by: Ivy Evans --- gemfiles/rails_6.1.gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index db27e4bb..e7868055 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -11,7 +11,7 @@ group :test do # logstash does not release any gems on rubygems, but they have two gemspecs within their repo. # Using the tag is an attempt of having a stable version to test against where we can ensure that # we test against the correct code. - gem 'logstash-event', git: 'https://github.com/elastic/logstash', tag: 'v1.5.6' + gem 'logstash-event', git: 'https://github.com/elastic/logstash', tag: 'v1.5.4' # logstash 1.5.4 is only supported with jrjackson up to 0.2.9 gem 'jrjackson', '~> 0.2.9', platforms: :jruby gem 'lines'