Added OpenSearch to CI

Andrew Kane
1 parent df1364c8
Showing 3 changed files with 22 additions and 0 deletions Show diff stats
.github/workflows/build.yml
CHANGELOG.md
test/language_test.rb
@@ -10,6 +10,9 @@ jobs:
         - ruby: 3.0
           gemfile: Gemfile
           elasticsearch: 7.12.1
+        - ruby: 3.0
+          gemfile: Gemfile
+          opensearch: 1
         - ruby: 2.7
           gemfile: gemfiles/activerecord60.gemfile
           elasticsearch: 7.12.1
@@ -40,11 +43,14 @@ jobs:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
     - run: bundle update
+
     - uses: actions/cache@v2
+      if: ${{ matrix.elasticsearch }}
       with:
         path: ~/elasticsearch
         key: ${{ runner.os }}-elasticsearch-${{ matrix.elasticsearch }}
     - uses: ankane/setup-elasticsearch@v1
+      if: ${{ matrix.elasticsearch }}
       with:
         elasticsearch-version: ${{ matrix.elasticsearch }}
         plugins: |
@@ -52,6 +58,17 @@ jobs:
           analysis-smartcn
           analysis-stempel
           analysis-ukrainian
+
+    - uses: actions/cache@v2
+      if: ${{ matrix.opensearch }}
+      with:
+        path: ~/opensearch
+        key: ${{ runner.os }}-opensearch-${{ matrix.opensearch }}
+    - uses: ankane/setup-opensearch@v1
+      if: ${{ matrix.opensearch }}
+      with:
+        opensearch-version: ${{ matrix.opensearch }}
+
     - uses: ankane/setup-mongodb@v1
       if: ${{ matrix.mongodb }}
     - run: |
+## 4.5.0 (unreleased)
+
+- Added experimental support for OpenSearch
+
 ## 4.4.4 (2021-03-12)
 - Fixed `too_long_frame_exception` with `scroll` method
@@ -3,6 +3,7 @@ require_relative &quot;test_helper&quot;
 class LanguageTest < Minitest::Test
   def setup
     skip "Requires plugin" unless ci? || ENV["TEST_LANGUAGE"]
+    skip "Requires Elasticsearch" if Searchkick.opensearch?
     Song.destroy_all
   end
	@@ -10,6 +10,9 @@ jobs:		@@ -10,6 +10,9 @@ jobs:
10	- ruby: 3.0	10	- ruby: 3.0
11	gemfile: Gemfile	11	gemfile: Gemfile
12	elasticsearch: 7.12.1	12	elasticsearch: 7.12.1
		13	+ - ruby: 3.0
		14	+ gemfile: Gemfile
		15	+ opensearch: 1
13	- ruby: 2.7	16	- ruby: 2.7
14	gemfile: gemfiles/activerecord60.gemfile	17	gemfile: gemfiles/activerecord60.gemfile
15	elasticsearch: 7.12.1	18	elasticsearch: 7.12.1
	@@ -40,11 +43,14 @@ jobs:		@@ -40,11 +43,14 @@ jobs:
40	ruby-version: ${{ matrix.ruby }}	43	ruby-version: ${{ matrix.ruby }}
41	bundler-cache: true	44	bundler-cache: true
42	- run: bundle update	45	- run: bundle update
		46	+
43	- uses: actions/cache@v2	47	- uses: actions/cache@v2
		48	+ if: ${{ matrix.elasticsearch }}
44	with:	49	with:
45	path: ~/elasticsearch	50	path: ~/elasticsearch
46	key: ${{ runner.os }}-elasticsearch-${{ matrix.elasticsearch }}	51	key: ${{ runner.os }}-elasticsearch-${{ matrix.elasticsearch }}
47	- uses: ankane/setup-elasticsearch@v1	52	- uses: ankane/setup-elasticsearch@v1
		53	+ if: ${{ matrix.elasticsearch }}
48	with:	54	with:
49	elasticsearch-version: ${{ matrix.elasticsearch }}	55	elasticsearch-version: ${{ matrix.elasticsearch }}
50	plugins: \|	56	plugins: \|
	@@ -52,6 +58,17 @@ jobs:		@@ -52,6 +58,17 @@ jobs:
52	analysis-smartcn	58	analysis-smartcn
53	analysis-stempel	59	analysis-stempel
54	analysis-ukrainian	60	analysis-ukrainian
		61	+
		62	+ - uses: actions/cache@v2
		63	+ if: ${{ matrix.opensearch }}
		64	+ with:
		65	+ path: ~/opensearch
		66	+ key: ${{ runner.os }}-opensearch-${{ matrix.opensearch }}
		67	+ - uses: ankane/setup-opensearch@v1
		68	+ if: ${{ matrix.opensearch }}
		69	+ with:
		70	+ opensearch-version: ${{ matrix.opensearch }}
		71	+
55	- uses: ankane/setup-mongodb@v1	72	- uses: ankane/setup-mongodb@v1
56	if: ${{ matrix.mongodb }}	73	if: ${{ matrix.mongodb }}
57	- run: \|	74	- run: \|
		1	+## 4.5.0 (unreleased)
		2	+
		3	+- Added experimental support for OpenSearch
		4	+
1	## 4.4.4 (2021-03-12)	5	## 4.4.4 (2021-03-12)
2		6
3	- Fixed `too_long_frame_exception` with `scroll` method	7	- Fixed `too_long_frame_exception` with `scroll` method
	@@ -3,6 +3,7 @@ require_relative "test_helper"		@@ -3,6 +3,7 @@ require_relative "test_helper"
3	class LanguageTest < Minitest::Test	3	class LanguageTest < Minitest::Test
4	def setup	4	def setup
5	skip "Requires plugin" unless ci? \|\| ENV["TEST_LANGUAGE"]	5	skip "Requires plugin" unless ci? \|\| ENV["TEST_LANGUAGE"]
		6	+ skip "Requires Elasticsearch" if Searchkick.opensearch?
6		7
7	Song.destroy_all	8	Song.destroy_all
8	end	9	end