Merge pull request #4 from Badiapp/toptal/chewy-v6.0

Toptal/chewy v6.0
Badiapp · Jul 20, 2023 · d399cff · d399cff
2 parents b65d75d + d56adc4
commit d399cff
Show file tree

Hide file tree

Showing 101 changed files with 991 additions and 5,915 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,7 @@
 # Check https://circleci.com/docs/2.0/language-ruby/ for more details
 version: 2.1
 
-es56-env: &es56-env
+es-env: &es-env
   cluster.name: elasticsearch
   transport.host: localhost
   network.host: 127.0.0.1
@@ -23,6 +23,8 @@ workflows:
       - rspec-ruby-27-activerecord52
       - rspec-ruby-27-mongoid
       - rspec-ruby-30-activerecord61
+      - rspec-ruby-27-activerecord61-es6
+      - rspec-ruby-30-activerecord61-es6
 
 commands:
   rspec-test:
@@ -108,7 +110,7 @@ jobs:
       - image: circleci/ruby:2.6
       - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
         environment:
-          <<: *es56-env
+          <<: *es-env
     working_directory: ~/repo
     environment:
       GEMFILE: gemfiles/rails.5.2.activerecord.gemfile
@@ -120,7 +122,7 @@ jobs:
       - image: circleci/ruby:2.6
       - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
         environment:
-          <<: *es56-env
+          <<: *es-env
     working_directory: ~/repo
     environment:
       GEMFILE: gemfiles/rails.6.0.activerecord.gemfile
@@ -132,7 +134,7 @@ jobs:
       - image: circleci/ruby:2.6
       - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
         environment:
-          <<: *es56-env
+          <<: *es-env
     working_directory: ~/repo
     environment:
       GEMFILE: gemfiles/rails.6.1.activerecord.gemfile
@@ -145,7 +147,7 @@ jobs:
       - image: circleci/mongo:4.2.5
       - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
         environment:
-          <<: *es56-env
+          <<: *es-env
     working_directory: ~/repo
     environment:
       GEMFILE: gemfiles/rails.5.2.mongoid.6.4.gemfile
@@ -157,7 +159,7 @@ jobs:
       - image: circleci/ruby:2.7
       - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
         environment:
-          <<: *es56-env
+          <<: *es-env
     working_directory: ~/repo
     environment:
       GEMFILE: gemfiles/rails.5.2.activerecord.gemfile
@@ -169,7 +171,7 @@ jobs:
       - image: circleci/ruby:2.7
       - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
         environment:
-          <<: *es56-env
+          <<: *es-env
     working_directory: ~/repo
     environment:
       GEMFILE: gemfiles/rails.6.0.activerecord.gemfile
@@ -181,7 +183,7 @@ jobs:
       - image: circleci/ruby:2.7
       - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
         environment:
-          <<: *es56-env
+          <<: *es-env
     working_directory: ~/repo
     environment:
       GEMFILE: gemfiles/rails.6.1.activerecord.gemfile
@@ -194,7 +196,7 @@ jobs:
       - image: circleci/mongo:4.2.5
       - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
         environment:
-          <<: *es56-env
+          <<: *es-env
     working_directory: ~/repo
     environment:
       GEMFILE: gemfiles/rails.5.2.mongoid.6.4.gemfile
@@ -206,7 +208,31 @@ jobs:
       - image: circleci/ruby:3.0
       - image: docker.elastic.co/elasticsearch/elasticsearch:5.6.7
         environment:
-          <<: *es56-env
+          <<: *es-env
+    working_directory: ~/repo
+    environment:
+      GEMFILE: gemfiles/rails.6.1.activerecord.gemfile
+    steps:
+      - rspec-test
+
+  rspec-ruby-27-activerecord61-es6:
+    docker:
+      - image: circleci/ruby:2.7
+      - image: docker.elastic.co/elasticsearch/elasticsearch:6.8.13
+        environment:
+          <<: *es-env
+    working_directory: ~/repo
+    environment:
+      GEMFILE: gemfiles/rails.6.1.activerecord.gemfile
+    steps:
+      - rspec-test
+
+  rspec-ruby-30-activerecord61-es6:
+    docker:
+      - image: circleci/ruby:3.0
+      - image: docker.elastic.co/elasticsearch/elasticsearch:6.8.13
+        environment:
+          <<: *es-env
     working_directory: ~/repo
     environment:
       GEMFILE: gemfiles/rails.6.1.activerecord.gemfile