Skip to content

Commit 6763d81

Browse files
authored
Upgrade Ruby to 2.7, Bundler to 2.2.20 (18F#241)
* Upgrade Ruby to 2.7, Bundler to 2.2.20 **Why**: To sync with identity-idp, and to resolve CircleCI build failures. * Restore capitalization
1 parent 7865f64 commit 6763d81

File tree

3 files changed

+37
-36
lines changed

3 files changed

+37
-36
lines changed

.circleci/config.yml

+14-11
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
11
version: 2.1
22

3+
executors:
4+
ruby_node_browsers:
5+
docker:
6+
- image: circleci/ruby:2.7-node-browsers
7+
environment:
8+
BUNDLER_VERSION: 2.2.20
9+
310
commands:
411
bundle-npm-install:
512
steps:
613
- restore_cache:
7-
key: dependency-cache-ruby-2-6-{{ checksum "package-lock.json" }}-{{ checksum "Gemfile.lock" }}
14+
key: dependency-cache-ruby-2-7-{{ checksum "package-lock.json" }}-{{ checksum "Gemfile.lock" }}
815
- run:
916
name: Update Bundler
10-
command: gem install bundler -v "<2"
17+
command: gem install bundler --version $BUNDLER_VERSION
1118
- run:
1219
name: Install bundle dependencies
1320
command: bundle check --path ~/.bundler || bundle install --path ~/.bundler
1421
- run:
1522
name: Install dependencies
1623
command: npm ci
1724
- save_cache:
18-
key: dependency-cache-ruby-2-6-{{ checksum "package-lock.json" }}-{{ checksum "Gemfile.lock" }}
25+
key: dependency-cache-ruby-2-7-{{ checksum "package-lock.json" }}-{{ checksum "Gemfile.lock" }}
1926
paths:
2027
- ~/.npm
2128
- ~/.bundler
@@ -28,8 +35,7 @@ commands:
2835
jobs:
2936
lints:
3037
working_directory: ~/identity-style-guide
31-
docker:
32-
- image: circleci/ruby:2.6-node-browsers
38+
executor: ruby_node_browsers
3339
steps:
3440
- checkout
3541
- bundle-npm-install
@@ -38,8 +44,7 @@ jobs:
3844
command: npm run lint
3945
integration:
4046
working_directory: ~/identity-style-guide
41-
docker:
42-
- image: circleci/ruby:2.6-node-browsers
47+
executor: ruby_node_browsers
4348
environment:
4449
SKIP_VISUAL_REGRESSION_TEST: true
4550
steps:
@@ -51,8 +56,7 @@ jobs:
5156
command: npm run test-jest
5257
visual-regression:
5358
working_directory: ~/identity-style-guide
54-
docker:
55-
- image: circleci/ruby:2.6-node-browsers
59+
executor: ruby_node_browsers
5660
environment:
5761
ONLY_VISUAL_REGRESSION_TEST: true
5862
steps:
@@ -69,8 +73,7 @@ jobs:
6973
path: tmp/results
7074
accessibility:
7175
working_directory: ~/identity-style-guide
72-
docker:
73-
- image: circleci/ruby:2.6-node-browsers
76+
executor: ruby_node_browsers
7477
steps:
7578
- checkout
7679
- bundle-npm-install

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6
1+
2.7

Gemfile.lock

+22-24
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,36 @@ GEM
44
addressable (2.8.0)
55
public_suffix (>= 2.0.2, < 5.0)
66
colorator (1.1.0)
7-
concurrent-ruby (1.1.5)
8-
em-websocket (0.5.1)
7+
concurrent-ruby (1.1.9)
8+
em-websocket (0.5.2)
99
eventmachine (>= 0.12.9)
1010
http_parser.rb (~> 0.6.0)
1111
eventmachine (1.2.7)
12-
ffi (1.11.1)
12+
ffi (1.15.3)
1313
forwardable-extended (2.6.0)
1414
http_parser.rb (0.6.0)
15-
i18n (1.6.0)
15+
i18n (1.8.10)
1616
concurrent-ruby (~> 1.0)
17-
jekyll (4.0.0)
17+
jekyll (4.2.0)
1818
addressable (~> 2.4)
1919
colorator (~> 1.0)
2020
em-websocket (~> 0.5)
21-
i18n (>= 0.9.5, < 2)
21+
i18n (~> 1.0)
2222
jekyll-sass-converter (~> 2.0)
2323
jekyll-watch (~> 2.0)
24-
kramdown (~> 2.1)
24+
kramdown (~> 2.3)
2525
kramdown-parser-gfm (~> 1.0)
2626
liquid (~> 4.0)
27-
mercenary (~> 0.3.3)
27+
mercenary (~> 0.4.0)
2828
pathutil (~> 0.9)
2929
rouge (~> 3.0)
3030
safe_yaml (~> 1.0)
31-
terminal-table (~> 1.8)
31+
terminal-table (~> 2.0)
3232
jekyll-redirect-from (0.16.0)
3333
jekyll (>= 3.3, < 5.0)
34-
jekyll-sass-converter (2.0.0)
34+
jekyll-sass-converter (2.1.0)
3535
sassc (> 2.0.1, < 3.0)
36-
jekyll-sitemap (1.3.1)
36+
jekyll-sitemap (1.4.0)
3737
jekyll (>= 3.7, < 5.0)
3838
jekyll-watch (2.2.1)
3939
listen (~> 3.0)
@@ -42,26 +42,24 @@ GEM
4242
kramdown-parser-gfm (1.1.0)
4343
kramdown (~> 2.0)
4444
liquid (4.0.3)
45-
listen (3.1.5)
46-
rb-fsevent (~> 0.9, >= 0.9.4)
47-
rb-inotify (~> 0.9, >= 0.9.7)
48-
ruby_dep (~> 1.2)
49-
mercenary (0.3.6)
45+
listen (3.7.0)
46+
rb-fsevent (~> 0.10, >= 0.10.3)
47+
rb-inotify (~> 0.9, >= 0.9.10)
48+
mercenary (0.4.0)
5049
pathutil (0.16.2)
5150
forwardable-extended (~> 2.6)
5251
public_suffix (4.0.6)
53-
rb-fsevent (0.10.3)
54-
rb-inotify (0.10.0)
52+
rb-fsevent (0.11.0)
53+
rb-inotify (0.10.1)
5554
ffi (~> 1.0)
5655
rexml (3.2.5)
57-
rouge (3.9.0)
58-
ruby_dep (1.5.0)
56+
rouge (3.26.0)
5957
safe_yaml (1.0.5)
60-
sassc (2.1.0)
58+
sassc (2.4.0)
6159
ffi (~> 1.9)
62-
terminal-table (1.8.0)
60+
terminal-table (2.0.0)
6361
unicode-display_width (~> 1.1, >= 1.1.1)
64-
unicode-display_width (1.6.0)
62+
unicode-display_width (1.7.0)
6563

6664
PLATFORMS
6765
ruby
@@ -72,4 +70,4 @@ DEPENDENCIES
7270
jekyll-sitemap (>= 1.3.1)
7371

7472
BUNDLED WITH
75-
1.17.3
73+
2.2.20

0 commit comments

Comments
 (0)