.circleci/config.yml in bixby-3.0.2 vs .circleci/config.yml in bixby-4.0.0

@@ -1,55 +1,58 @@
 version: 2.1
 
 orbs:
-  samvera: samvera/circleci-orb@0
+  samvera: samvera/circleci-orb@1
 
 jobs:
   bundle_lint_test:
     parameters:
       ruby_version:
         type: string
       project:
         type: string
       bundler_version:
         type: string
-        default: 1.17.3
+        default: 2.3.6
 
     executor:
       name: 'samvera/ruby'
       ruby_version: << parameters.ruby_version >>
 
     steps:
+      - checkout
+
+      - run:
+          name: Check for 'master' branch
+          command: |
+            git fetch --all --quiet --prune --prune-tags
+            if [[ -n "$(git branch --all --list master */master)" ]]; then
+                echo "A branch named 'master' was found. Please remove it."
+                echo "$(git branch --all --list master */master)"
+            fi
+            [[ -z "$(git branch --all --list master */master)" ]]
       - samvera/cached_checkout
 
-      - samvera/bundle_for_gem:
+      - samvera/bundle:
           ruby_version: << parameters.ruby_version >>
           bundler_version: << parameters.bundler_version >>
-          project: << parameters.project >>
-          cache_version: '2'
 
       - samvera/rubocop
 
 workflows:
   version: 2
   ci:
     jobs:
       - bundle_lint_test:
           project: bixby
-          name: ruby2-4
-          ruby_version: 2.4.10
-
-      - bundle_lint_test:
-          project: bixby
-          name: ruby2-5
-          ruby_version: 2.5.8
-
-      - bundle_lint_test:
-          project: bixby
           name: ruby2-6
-          ruby_version: 2.6.6
+          ruby_version: 2.6.9
 
       - bundle_lint_test:
           project: bixby
           name: ruby2-7
-          ruby_version: 2.7.1
+          ruby_version: 2.7.5
 
+      - bundle_lint_test:
+          project: bixby
+          name: ruby3-0
+          ruby_version: 3.0.3