From 6aee0b498097e8e8b0bf38559aff7ea032b9782b Mon Sep 17 00:00:00 2001
From: Andrew Kane <andrew@ankane.org>
Date: Tue, 28 Jun 2022 12:50:04 -0400
Subject: [PATCH] Test with latest Elasticsearch and OpenSearch versions on CI

---
 .github/workflows/build.yml  |  8 ++++----
 gemfiles/opensearch.gemfile  | 17 -----------------
 gemfiles/opensearch1.gemfile | 17 +++++++++++++++++
 gemfiles/opensearch2.gemfile | 17 +++++++++++++++++
 4 files changed, 38 insertions(+), 21 deletions(-)
 delete mode 100644 gemfiles/opensearch.gemfile
 create mode 100644 gemfiles/opensearch1.gemfile
 create mode 100644 gemfiles/opensearch2.gemfile

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2d22505..1ae45d2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,12 +8,12 @@ jobs:
         include:
         - ruby: 3.1
           gemfile: Gemfile
-          elasticsearch: 8.2.3
+          elasticsearch: 8.3.0
         - ruby: 3.1
-          gemfile: gemfiles/opensearch.gemfile
-          opensearch: 2.0.0
+          gemfile: gemfiles/opensearch2.gemfile
+          opensearch: 2.0.1
         - ruby: "3.0"
-          gemfile: gemfiles/opensearch.gemfile
+          gemfile: gemfiles/opensearch1.gemfile
           opensearch: 1.3.3
         - ruby: "3.0"
           gemfile: gemfiles/activerecord61.gemfile
diff --git a/gemfiles/opensearch.gemfile b/gemfiles/opensearch.gemfile
deleted file mode 100644
index 9df814c..0000000
--- a/gemfiles/opensearch.gemfile
+++ /dev/null
@@ -1,17 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rake"
-gem "minitest", ">= 5"
-gem "activerecord", "~> 7.0.0"
-gem "activejob", "~> 7.0.0", require: "active_job"
-gem "actionpack", "~> 7.0.0"
-gem "sqlite3"
-gem "gemoji-parser"
-gem "typhoeus"
-gem "redis"
-gem "connection_pool"
-gem "kaminari"
-gem "opensearch-ruby"
-gem "parallel_tests"
diff --git a/gemfiles/opensearch1.gemfile b/gemfiles/opensearch1.gemfile
new file mode 100644
index 0000000..ba90603
--- /dev/null
+++ b/gemfiles/opensearch1.gemfile
@@ -0,0 +1,17 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rake"
+gem "minitest", ">= 5"
+gem "activerecord", "~> 7.0.0"
+gem "activejob", "~> 7.0.0", require: "active_job"
+gem "actionpack", "~> 7.0.0"
+gem "sqlite3"
+gem "gemoji-parser"
+gem "typhoeus"
+gem "redis"
+gem "connection_pool"
+gem "kaminari"
+gem "opensearch-ruby", "~> 1"
+gem "parallel_tests"
diff --git a/gemfiles/opensearch2.gemfile b/gemfiles/opensearch2.gemfile
new file mode 100644
index 0000000..a524c3c
--- /dev/null
+++ b/gemfiles/opensearch2.gemfile
@@ -0,0 +1,17 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rake"
+gem "minitest", ">= 5"
+gem "activerecord", "~> 7.0.0"
+gem "activejob", "~> 7.0.0", require: "active_job"
+gem "actionpack", "~> 7.0.0"
+gem "sqlite3"
+gem "gemoji-parser"
+gem "typhoeus"
+gem "redis"
+gem "connection_pool"
+gem "kaminari"
+gem "opensearch-ruby", "~> 2"
+gem "parallel_tests"
--
libgit2 0.21.0