From 8c4c7340438e30c83071106824967b2ea221bd68 Mon Sep 17 00:00:00 2001
From: Brooke Kuhlmann <brooke@alchemists.io>
Date: Sat, 23 Jan 2021 17:50:00 -0700
Subject: [PATCH] Updated to Circle CI 2.1.0

Necessary to pick up the new syntax, configuration location, and custom
Docker image.
---
 .circleci/config.yml | 31 ++++++++++++++++++++++
 circle.yml           | 62 --------------------------------------------
 2 files changed, 31 insertions(+), 62 deletions(-)
 create mode 100644 .circleci/config.yml
 delete mode 100644 circle.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..069b71f
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,31 @@
+version: 2.1
+jobs:
+  build:
+    working_directory: ~/project
+    docker:
+      - image: bkuhlmann/ruby:latest
+    steps:
+      - checkout
+
+      - restore_cache:
+          name: Bundler Restore
+          keys:
+            - gem-cache-{{.Branch}}-{{checksum "Gemfile"}}
+            - gem-cache-
+
+      - run:
+          name: Bundler Install
+          command: |
+            gem update --system
+            bundle config set path "vendor/bundle"
+            bundle install
+
+      - save_cache:
+          name: Bundler Store
+          key: gem-cache-{{.Branch}}-{{checksum "Gemfile"}}
+          paths:
+            - vendor/bundle
+
+      - run:
+          name: Build
+          command: bundle exec rake
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 5509295..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-version: 2
-jobs:
-  build:
-    working_directory: ~/project
-    docker:
-      - image: circleci/ruby
-        environment:
-          BUNDLE_JOBS: 3
-          BUNDLE_RETRY: 3
-          BUNDLE_PATH: vendor/bundle
-          EDITOR: vim
-    steps:
-      - checkout
-
-      - run:
-          name: Environment Setup
-          command: |
-            printf "%s\n" 'export CI_RUBY_VERSION=$(cat ".ruby-version" | tr -d "\n")' >> $BASH_ENV
-
-      - type: cache-restore
-        name: Ruby Restore
-        key: ruby-{{checksum ".ruby-version"}}
-
-      - run:
-          name: Ruby Install
-          command: |
-            cd ..
-            curl https://cache.ruby-lang.org/pub/ruby/${CI_RUBY_VERSION::-2}/ruby-$CI_RUBY_VERSION.tar.gz > ruby-$CI_RUBY_VERSION.tar.gz
-            tar --extract --gzip --verbose --file ruby-$CI_RUBY_VERSION.tar.gz
-            cd ruby-$CI_RUBY_VERSION
-            ./configure
-            make
-            make update-gems
-            make extract-gems
-            sudo make install
-
-      - type: cache-save
-        name: Ruby Store
-        key: ruby-{{checksum ".ruby-version"}}
-        paths:
-          - ../ruby-$CI_RUBY_VERSION
-
-      - type: cache-restore
-        name: Bundler Restore
-        key: bundler-{{checksum "Gemfile"}}
-
-      - run:
-          name: Bundler Install
-          command: |
-            gem update --system
-            bundle config set path "vendor/bundle"
-            bundle install
-
-      - type: cache-save
-        name: Bundler Store
-        key: bundler-{{checksum "Gemfile"}}
-        paths:
-          - vendor/bundle
-
-      - run:
-          name: Build
-          command: bundle exec rake