diff --git a/.circleci/config.yml b/.circleci/config.yml index 60124720..fbc091fb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,13 +1,20 @@ version: 2.1 +executors: + ruby_node_browsers: + docker: + - image: circleci/ruby:2.7-node-browsers + environment: + BUNDLER_VERSION: 2.2.20 + commands: bundle-npm-install: steps: - restore_cache: - key: dependency-cache-ruby-2-6-{{ checksum "package-lock.json" }}-{{ checksum "Gemfile.lock" }} + key: dependency-cache-ruby-2-7-{{ checksum "package-lock.json" }}-{{ checksum "Gemfile.lock" }} - run: name: Update Bundler - command: gem install bundler -v "<2" + command: gem install bundler --version $BUNDLER_VERSION - run: name: Install bundle dependencies command: bundle check --path ~/.bundler || bundle install --path ~/.bundler @@ -15,7 +22,7 @@ commands: name: Install dependencies command: npm ci - save_cache: - key: dependency-cache-ruby-2-6-{{ checksum "package-lock.json" }}-{{ checksum "Gemfile.lock" }} + key: dependency-cache-ruby-2-7-{{ checksum "package-lock.json" }}-{{ checksum "Gemfile.lock" }} paths: - ~/.npm - ~/.bundler @@ -28,8 +35,7 @@ commands: jobs: lints: working_directory: ~/identity-style-guide - docker: - - image: circleci/ruby:2.6-node-browsers + executor: ruby_node_browsers steps: - checkout - bundle-npm-install @@ -38,8 +44,7 @@ jobs: command: npm run lint integration: working_directory: ~/identity-style-guide - docker: - - image: circleci/ruby:2.6-node-browsers + executor: ruby_node_browsers environment: SKIP_VISUAL_REGRESSION_TEST: true steps: @@ -51,8 +56,7 @@ jobs: command: npm run test-jest visual-regression: working_directory: ~/identity-style-guide - docker: - - image: circleci/ruby:2.6-node-browsers + executor: ruby_node_browsers environment: ONLY_VISUAL_REGRESSION_TEST: true steps: @@ -69,8 +73,7 @@ jobs: path: tmp/results accessibility: working_directory: ~/identity-style-guide - docker: - - image: circleci/ruby:2.6-node-browsers + executor: ruby_node_browsers steps: - checkout - bundle-npm-install diff --git a/.ruby-version b/.ruby-version index 5154b3f6..1effb003 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6 +2.7 diff --git a/Gemfile.lock b/Gemfile.lock index 421bae87..2614b825 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,36 +4,36 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) - concurrent-ruby (1.1.5) - em-websocket (0.5.1) + concurrent-ruby (1.1.9) + em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) - ffi (1.11.1) + ffi (1.15.3) forwardable-extended (2.6.0) http_parser.rb (0.6.0) - i18n (1.6.0) + i18n (1.8.10) concurrent-ruby (~> 1.0) - jekyll (4.0.0) + jekyll (4.2.0) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (>= 0.9.5, < 2) + i18n (~> 1.0) jekyll-sass-converter (~> 2.0) jekyll-watch (~> 2.0) - kramdown (~> 2.1) + kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.3.3) + mercenary (~> 0.4.0) pathutil (~> 0.9) rouge (~> 3.0) safe_yaml (~> 1.0) - terminal-table (~> 1.8) + terminal-table (~> 2.0) jekyll-redirect-from (0.16.0) jekyll (>= 3.3, < 5.0) - jekyll-sass-converter (2.0.0) + jekyll-sass-converter (2.1.0) sassc (> 2.0.1, < 3.0) - jekyll-sitemap (1.3.1) + jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) @@ -42,26 +42,24 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - mercenary (0.3.6) + listen (3.7.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (4.0.6) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rb-fsevent (0.11.0) + rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.5) - rouge (3.9.0) - ruby_dep (1.5.0) + rouge (3.26.0) safe_yaml (1.0.5) - sassc (2.1.0) + sassc (2.4.0) ffi (~> 1.9) - terminal-table (1.8.0) + terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) - unicode-display_width (1.6.0) + unicode-display_width (1.7.0) PLATFORMS ruby @@ -72,4 +70,4 @@ DEPENDENCIES jekyll-sitemap (>= 1.3.1) BUNDLED WITH - 1.17.3 + 2.2.20