Skip to content

Commit 61add79

Browse files
authored
Merge pull request #237 from github/align-jekyll-versions-to-github-pages
align jekyll versions to github pages
2 parents 3250488 + 0217d1e commit 61add79

5 files changed

Lines changed: 82 additions & 86 deletions

File tree

.github/workflows/lighthouse.yml

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,50 +8,29 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout the project
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v3
1212

13-
- name: Use Node.js 14.x (LTS)
14-
uses: actions/setup-node@v1
13+
- name: Use Node.js 16.x (LTS)
14+
uses: actions/setup-node@v3
1515
with:
16-
node-version: 14.x
16+
node-version: 16.x
17+
cache: 'npm'
18+
- run: npm ci
1719

18-
- name: Use Ruby 2.7
19-
uses: actions/setup-ruby@v1
20+
- name: Use Ruby 2.7.3
21+
uses: ruby/setup-ruby@v1
2022
with:
21-
ruby-version: '2.7'
22-
23-
- name: Restore npm cache
24-
uses: actions/cache@v2
25-
with:
26-
path: ~/.npm
27-
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
28-
restore-keys: |
29-
${{ runner.os }}-node-
30-
31-
- name: Restore Bundler cache
32-
uses: actions/cache@v2
33-
with:
34-
path: docs/vendor/bundle
35-
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
36-
restore-keys: |
37-
${{ runner.os }}-gems-
38-
39-
- name: Configure Bundler cache
40-
run: |
41-
bundle config path vendor/bundle
42-
43-
- name: Install dependencies
44-
run: |
45-
npm ci
46-
cd docs && bundle install && cd ..
23+
ruby-version: '2.7.3'
24+
bundler-cache: true
25+
working-directory: docs
4726

4827
- name: Build docs
4928
run: npm run build:docs
5029
env:
5130
JEKYLL_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5231

5332
- name: Run Lighthouse CI
54-
run: npx @lhci/cli@0.7.x autorun
33+
run: npx @lhci/cli@0.9.x autorun
5534
env:
5635
JEKYLL_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5736
LHCI_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

docs/Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
source 'https://rubygems.org'
44

5-
gem 'jekyll', '~> 4.1.1'
5+
gem 'jekyll'
66

77
group :jekyll_plugins do
8-
gem 'jekyll-commonmark-ghpages', '~> 0.1.5'
8+
gem 'jekyll-commonmark-ghpages'
99
gem 'jekyll-github-metadata'
1010
gem 'jekyll-gzip'
1111
end

docs/Gemfile.lock

Lines changed: 62 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -4,92 +4,107 @@ GEM
44
addressable (2.8.0)
55
public_suffix (>= 2.0.2, < 5.0)
66
colorator (1.1.0)
7-
commonmarker (0.17.13)
8-
ruby-enum (~> 0.5)
9-
concurrent-ruby (1.1.7)
10-
em-websocket (0.5.2)
7+
commonmarker (0.23.4)
8+
concurrent-ruby (1.1.10)
9+
em-websocket (0.5.3)
1110
eventmachine (>= 0.12.9)
12-
http_parser.rb (~> 0.6.0)
11+
http_parser.rb (~> 0)
1312
eventmachine (1.2.7)
14-
faraday (1.0.0)
13+
faraday (1.10.0)
14+
faraday-em_http (~> 1.0)
15+
faraday-em_synchrony (~> 1.0)
16+
faraday-excon (~> 1.1)
17+
faraday-httpclient (~> 1.0)
18+
faraday-multipart (~> 1.0)
19+
faraday-net_http (~> 1.0)
20+
faraday-net_http_persistent (~> 1.0)
21+
faraday-patron (~> 1.0)
22+
faraday-rack (~> 1.0)
23+
faraday-retry (~> 1.0)
24+
ruby2_keywords (>= 0.0.4)
25+
faraday-em_http (1.0.0)
26+
faraday-em_synchrony (1.0.0)
27+
faraday-excon (1.1.0)
28+
faraday-httpclient (1.0.1)
29+
faraday-multipart (1.0.3)
1530
multipart-post (>= 1.2, < 3)
16-
ffi (1.13.1)
31+
faraday-net_http (1.0.1)
32+
faraday-net_http_persistent (1.2.0)
33+
faraday-patron (1.0.0)
34+
faraday-rack (1.0.0)
35+
faraday-retry (1.0.3)
36+
ffi (1.15.5)
1737
forwardable-extended (2.6.0)
18-
http_parser.rb (0.6.0)
19-
i18n (1.8.5)
38+
http_parser.rb (0.8.0)
39+
i18n (0.9.5)
2040
concurrent-ruby (~> 1.0)
21-
jekyll (4.1.1)
41+
jekyll (3.9.2)
2242
addressable (~> 2.4)
2343
colorator (~> 1.0)
2444
em-websocket (~> 0.5)
25-
i18n (~> 1.0)
26-
jekyll-sass-converter (~> 2.0)
45+
i18n (~> 0.7)
46+
jekyll-sass-converter (~> 1.0)
2747
jekyll-watch (~> 2.0)
28-
kramdown (~> 2.1)
29-
kramdown-parser-gfm (~> 1.0)
48+
kramdown (>= 1.17, < 3)
3049
liquid (~> 4.0)
31-
mercenary (~> 0.4.0)
50+
mercenary (~> 0.3.3)
3251
pathutil (~> 0.9)
33-
rouge (~> 3.0)
52+
rouge (>= 1.7, < 4)
3453
safe_yaml (~> 1.0)
35-
terminal-table (~> 1.8)
36-
jekyll-commonmark (1.3.1)
37-
commonmarker (~> 0.14)
38-
jekyll (>= 3.7, < 5.0)
39-
jekyll-commonmark-ghpages (0.1.6)
40-
commonmarker (~> 0.17.6)
41-
jekyll-commonmark (~> 1.2)
54+
jekyll-commonmark (1.4.0)
55+
commonmarker (~> 0.22)
56+
jekyll-commonmark-ghpages (0.2.0)
57+
commonmarker (~> 0.23.4)
58+
jekyll (~> 3.9.0)
59+
jekyll-commonmark (~> 1.4.0)
4260
rouge (>= 2.0, < 4.0)
43-
jekyll-github-metadata (2.13.0)
61+
jekyll-github-metadata (2.14.0)
4462
jekyll (>= 3.4, < 5.0)
4563
octokit (~> 4.0, != 4.4.0)
46-
jekyll-gzip (2.4.2)
64+
jekyll-gzip (2.5.1)
4765
jekyll (>= 3.0, < 5.0)
48-
jekyll-sass-converter (2.1.0)
49-
sassc (> 2.0.1, < 3.0)
66+
jekyll-sass-converter (1.5.2)
67+
sass (~> 3.4)
5068
jekyll-watch (2.2.1)
5169
listen (~> 3.0)
52-
kramdown (2.3.1)
70+
kramdown (2.4.0)
5371
rexml
54-
kramdown-parser-gfm (1.1.0)
55-
kramdown (~> 2.0)
5672
liquid (4.0.3)
57-
listen (3.3.3)
73+
listen (3.7.1)
5874
rb-fsevent (~> 0.10, >= 0.10.3)
5975
rb-inotify (~> 0.9, >= 0.9.10)
60-
mercenary (0.4.0)
76+
mercenary (0.3.6)
6177
multipart-post (2.1.1)
62-
octokit (4.16.0)
78+
octokit (4.22.0)
6379
faraday (>= 0.9)
6480
sawyer (~> 0.8.0, >= 0.5.3)
6581
pathutil (0.16.2)
6682
forwardable-extended (~> 2.6)
67-
public_suffix (4.0.6)
68-
rb-fsevent (0.10.4)
83+
public_suffix (4.0.7)
84+
rb-fsevent (0.11.1)
6985
rb-inotify (0.10.1)
7086
ffi (~> 1.0)
7187
rexml (3.2.5)
72-
rouge (3.25.0)
73-
ruby-enum (0.7.2)
74-
i18n
88+
rouge (3.28.0)
89+
ruby2_keywords (0.0.5)
7590
safe_yaml (1.0.5)
76-
sassc (2.4.0)
77-
ffi (~> 1.9)
91+
sass (3.7.4)
92+
sass-listen (~> 4.0.0)
93+
sass-listen (4.0.0)
94+
rb-fsevent (~> 0.9, >= 0.9.4)
95+
rb-inotify (~> 0.9, >= 0.9.7)
7896
sawyer (0.8.2)
7997
addressable (>= 2.3.5)
8098
faraday (> 0.8, < 2.0)
81-
terminal-table (1.8.0)
82-
unicode-display_width (~> 1.1, >= 1.1.1)
83-
unicode-display_width (1.7.0)
8499

85100
PLATFORMS
86-
ruby
101+
x86_64-linux
87102

88103
DEPENDENCIES
89-
jekyll (~> 4.1.1)
90-
jekyll-commonmark-ghpages (~> 0.1.5)
104+
jekyll
105+
jekyll-commonmark-ghpages
91106
jekyll-github-metadata
92107
jekyll-gzip
93108

94109
BUNDLED WITH
95-
2.1.4
110+
2.3.13

docs/_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ exclude:
1111
- Gemfile
1212
- Gemfile.lock
1313
- node_modules
14+
- vendor
1415

1516
collections:
1617
guide:

lighthouserc.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
"uses-text-compression": "off",
1313
"render-blocking-resources": "off",
1414
"uses-rel-preload": "off",
15-
"first-contentful-paint": ["warn", {"minScore": 0.8}],
16-
"first-meaningful-paint": ["warn", {"minScore": 0.8}],
17-
"largest-contentful-paint": ["warn", {"minScore": 0.8}],
18-
"deprecations": "off"
15+
"first-contentful-paint": ["error", {"minScore": 0.6}],
16+
"first-meaningful-paint": ["error", {"maxNumericValue": 3000}],
17+
"largest-contentful-paint": ["error", {"maxNumericValue": 3000}],
18+
"deprecations": "off",
19+
"csp-xss": "off"
1920
}
2021
},
2122
"upload": {

0 commit comments

Comments
 (0)