.circleci/config.yml in spree_auth_devise-4.5.0 vs .circleci/config.yml in spree_auth_devise-4.6.0

@@ -7,65 +7,27 @@
     BUNDLE_JOBS: 4
     BUNDLE_RETRY: 3
     BUNDLE_PATH: ~/spree/vendor/bundle
   working_directory: ~/spree
   docker:
-    - image: &ruby_image circleci/ruby:2.7-node-browsers
+    - image: &ruby_image circleci/ruby:3.0-node-browsers
     - image: &redis_image circleci/redis:6.2-alpine
 
-defaults_3_0: &defaults_3_0
-  <<: *defaults
-  docker:
-    - image: &ruby_3_0_image circleci/ruby:3.0-node-browsers
-    - image: *redis_image
-
 run_tests: &run_tests
   <<: *defaults
   steps:
     - checkout
     - restore_cache:
         keys:
-          - spree-auth-devise-bundle-v9-ruby-2-7-{{ .Branch }}
-          - spree-auth-devise-bundle-v9-ruby-2-7
-    - run:
-        name: Install libvips
-        command: sudo apt-get install libvips
-    - run:
-        name: Set bundle path
-        command: bundle config --local path vendor/bundle
-    - run:
-        name: Ensure bundle Install
-        command: |
-          bundle check || bundle install
-    - run:
-        name: Create test app
-        command: |
-          bundle exec rake test_app
-    - run:
-        name: Run Rspec
-        command: |
-          TESTFILES=$(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
-          bundle exec rspec --format documentation \
-                            --format RspecJunitFormatter \
-                            -o ~/rspec/rspec.xml \
-                            -- ${TESTFILES}
-    - store_test_results:
-        path: ~/rspec
-    - store_artifacts:
-        path: tmp/capybara
-
-run_tests_3_0: &run_tests_3_0
-  <<: *defaults_3_0
-  steps:
-    - checkout
-    - restore_cache:
-        keys:
           - spree-auth-devise-bundle-v9-ruby-3-0-{{ .Branch }}
           - spree-auth-devise-bundle-v9-ruby-3-0
     - run:
+        name: Add keyserver
+        command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
+    - run:
         name: Install libvips
-        command: sudo apt-get install libvips
+        command: sudo apt-get update && sudo apt-get install libvips
     - run:
         name: Set bundle path
         command: bundle config --local path vendor/bundle
     - run:
         name: Ensure bundle Install
@@ -93,38 +55,18 @@
     <<: *defaults
     steps:
       - checkout
       - restore_cache:
           keys:
-            - spree-auth-devise-bundle-v9-ruby-2-7-{{ .Branch }}
-            - spree-auth-devise-bundle-v9-ruby-2-7
-      - run:
-          name: Install libvips
-          command: sudo apt-get install libvips
-      - run:
-          name: Set bundle path
-          command: bundle config --local path vendor/bundle
-      - run:
-          name: Bundle Install
-          command: |
-            bundle check || bundle install
-      - save_cache:
-          paths:
-            - vendor/bundle
-          key: spree-auth-devise-bundle-v9-ruby-2-7-{{ checksum "Gemfile.lock" }}
-
-  bundle_ruby_3_0:
-    <<: *defaults_3_0
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
             - spree-auth-devise-bundle-v9-ruby-3-0-{{ .Branch }}
             - spree-auth-devise-bundle-v9-ruby-3-0
       - run:
+          name: Add keyserver
+          command: sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4EB27DB2A3B88B8B
+      - run:
           name: Install libvips
-          command: sudo apt-get install libvips
+          command: sudo apt-get update && sudo apt-get install libvips
       - run:
           name: Set bundle path
           command: bundle config --local path vendor/bundle
       - run:
           name: Bundle Install
@@ -147,19 +89,10 @@
       - image: *redis_image
       - image: &postgres_image circleci/postgres:12-alpine
         environment:
           POSTGRES_USER: postgres
 
-  tests_postgres_ruby_3_0: &tests_postgres_ruby_3_0
-    <<: *run_tests_3_0
-    environment:
-      <<: *postgres_environment
-    docker:
-      - image: *ruby_3_0_image
-      - image: *postgres_image
-      - image: *redis_image
-
   tests_mysql: &tests_mysql
     <<: *run_tests
     environment: &mysql_environment
       <<: *environment
       DB: mysql
@@ -175,15 +108,11 @@
 workflows:
   version: 2
   main:
     jobs:
       - bundle
-      - bundle_ruby_3_0
       - tests_postgres:
           requires:
             - bundle
-      - tests_postgres_ruby_3_0:
-          requires:
-            - bundle_ruby_3_0
       - tests_mysql:
           requires:
             - bundle