Skip to content

Commit 8efa79f

Browse files
remibetinremibetin
authored
Technical updates (#988)
* Remove the wai-website-data submodule. Use the wai-website-theme gem instead. * Update GitHub workflow dependencies * Use Ruby 3.4.8 * Misc updates * Technical updates * Clarify that baseurl and url values relate to GitHub Pages Use the correct branch name * Use the theme gem directly * Use the main branch for the wai-website-theme and wai-website-plugin gems Update Gemfile.lock accordingly * Use the latest versions of the theme and plugin in deploy previews
1 parent 65b014c commit 8efa79f

File tree

14 files changed

+143
-923
lines changed

14 files changed

+143
-923
lines changed

‎.github/workflows/process-form-submission.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Github action triggered as webhook from a netlify function
2-
# NB!!!! this MUST be on the branch set as GitHub's default if it is to be triggered
1+
# GitHub action triggered as webhook from a Netlify function
2+
# NB: this MUST be on the branch set as GitHub's default if it is to be triggered
33

44
name: Process Form Submission
55

@@ -12,16 +12,16 @@ jobs:
1212
name: Process Form
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v4
16-
15+
- name: Checkout the repository
16+
uses: actions/checkout@v6
1717
- name: Add new file to workspace
1818
run: "jq '.client_payload.form' $GITHUB_EVENT_PATH > _data/$REPOSITORY/submissions/$SUBMISSION_REF.json"
1919
env:
2020
SUBMISSION_REF: ${{ github.event.client_payload.form.submission_ref }}
2121
REPOSITORY: ${{ github.event.client_payload.form.repository }}
22-
- name: Create Pull Request
22+
- name: Create the pull request
2323
id: cpr
24-
uses: peter-evans/create-pull-request@v5
24+
uses: peter-evans/create-pull-request@v8
2525
with:
2626
commit-message: Add form submission
2727
committer: GitHub <[email protected]>

‎.gitmodules‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎Gemfile‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# frozen_string_literal: true
2+
13
source 'https://rubygems.org'
24

3-
gem "wai-gems", :path => "_external/data/wai-gems"
5+
# Gems loaded irrespective of site configuration.
6+
group :jekyll_plugins do
7+
gem 'wai-website-theme', git: 'https://github.com/w3c/wai-website-theme', branch: 'main' # The theme of the site
8+
gem 'wai-website-plugin', git: 'https://github.com/w3c/wai-website-plugin', branch: 'main' # The Jekyll plugins needed by the theme
9+
end

‎Gemfile.lock‎

Lines changed: 111 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,76 @@
1-
PATH
2-
remote: _external/data/wai-gems
1+
GIT
2+
remote: https://github.com/w3c/wai-website-plugin
3+
revision: e9f2c0e098caf80e010f1985ba942b6bf540e85e
4+
branch: main
35
specs:
4-
wai-gems (1.0.0)
5-
jekyll-github-metadata
6-
jekyll-include-cache
7-
jekyll-paginate
8-
jekyll-redirect-from
9-
jekyll-relative-links
10-
jekyll-remote-theme
11-
jekyll-seo-tag
12-
jekyll-sitemap
13-
wai-website-plugin
6+
wai-website-plugin (0.3)
7+
jekyll (~> 4.4.1)
8+
nokogiri (~> 1.19.0)
9+
10+
GIT
11+
remote: https://github.com/w3c/wai-website-theme
12+
revision: f33b9fef553b59ef8ecf35c3bef264de8b1ad4a9
13+
branch: main
14+
specs:
15+
wai-website-theme (1.10)
16+
jekyll (~> 4.4.1)
17+
jekyll-include-cache (~> 0.2.1)
18+
jekyll-paginate (~> 1.1.0)
19+
jekyll-redirect-from (~> 0.16.0)
20+
jekyll-seo-tag (~> 2.8.0)
21+
jekyll-sitemap (~> 1.4.0)
22+
logger (~> 1.7.0)
1423

1524
GEM
1625
remote: https://rubygems.org/
1726
specs:
18-
addressable (2.8.7)
19-
public_suffix (>= 2.0.2, < 7.0)
20-
bigdecimal (3.1.8)
27+
addressable (2.8.8)
28+
public_suffix (>= 2.0.2, < 8.0)
29+
base64 (0.3.0)
30+
bigdecimal (4.0.1)
2131
colorator (1.1.0)
22-
concurrent-ruby (1.3.3)
32+
concurrent-ruby (1.3.6)
33+
csv (3.3.5)
2334
em-websocket (0.5.3)
2435
eventmachine (>= 0.12.9)
2536
http_parser.rb (~> 0)
2637
eventmachine (1.2.7)
27-
faraday (2.9.2)
28-
faraday-net_http (>= 2.0, < 3.2)
29-
faraday-net_http (3.1.0)
30-
net-http
31-
ffi (1.17.0-x64-mingw-ucrt)
32-
ffi (1.17.0-x86_64-darwin)
33-
ffi (1.17.0-x86_64-linux-gnu)
38+
ffi (1.17.3-arm64-darwin)
39+
ffi (1.17.3-x86_64-linux-gnu)
3440
forwardable-extended (2.6.0)
35-
google-protobuf (4.27.5-x64-mingw-ucrt)
36-
bigdecimal
37-
rake (>= 13)
38-
google-protobuf (4.27.5-x86_64-darwin)
41+
google-protobuf (4.33.2-arm64-darwin)
3942
bigdecimal
4043
rake (>= 13)
41-
google-protobuf (4.27.5-x86_64-linux)
44+
google-protobuf (4.33.2-x86_64-linux-gnu)
4245
bigdecimal
4346
rake (>= 13)
44-
http_parser.rb (0.8.0)
45-
i18n (1.14.5)
47+
http_parser.rb (0.8.1)
48+
i18n (1.14.8)
4649
concurrent-ruby (~> 1.0)
47-
jekyll (4.3.3)
50+
jekyll (4.4.1)
4851
addressable (~> 2.4)
52+
base64 (~> 0.2)
4953
colorator (~> 1.0)
54+
csv (~> 3.0)
5055
em-websocket (~> 0.5)
5156
i18n (~> 1.0)
5257
jekyll-sass-converter (>= 2.0, < 4.0)
5358
jekyll-watch (~> 2.0)
59+
json (~> 2.6)
5460
kramdown (~> 2.3, >= 2.3.1)
5561
kramdown-parser-gfm (~> 1.0)
5662
liquid (~> 4.0)
57-
mercenary (>= 0.3.6, < 0.5)
63+
mercenary (~> 0.3, >= 0.3.6)
5864
pathutil (~> 0.9)
5965
rouge (>= 3.0, < 5.0)
6066
safe_yaml (~> 1.0)
6167
terminal-table (>= 1.8, < 4.0)
6268
webrick (~> 1.7)
63-
jekyll-github-metadata (2.16.1)
64-
jekyll (>= 3.4, < 5.0)
65-
octokit (>= 4, < 7, != 4.4.0)
6669
jekyll-include-cache (0.2.1)
6770
jekyll (>= 3.7, < 5.0)
6871
jekyll-paginate (1.1.0)
6972
jekyll-redirect-from (0.16.0)
7073
jekyll (>= 3.3, < 5.0)
71-
jekyll-relative-links (0.7.0)
72-
jekyll (>= 3.3, < 5.0)
73-
jekyll-remote-theme (0.4.3)
74-
addressable (~> 2.0)
75-
jekyll (>= 3.5, < 5.0)
76-
jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
77-
rubyzip (>= 1.3.0, < 3.0)
7874
jekyll-sass-converter (3.0.0)
7975
sass-embedded (~> 1.54)
8076
jekyll-seo-tag (2.8.0)
@@ -83,56 +79,98 @@ GEM
8379
jekyll (>= 3.7, < 5.0)
8480
jekyll-watch (2.2.1)
8581
listen (~> 3.0)
86-
kramdown (2.4.0)
87-
rexml
82+
json (2.18.0)
83+
kramdown (2.5.1)
84+
rexml (>= 3.3.9)
8885
kramdown-parser-gfm (1.1.0)
8986
kramdown (~> 2.0)
9087
liquid (4.0.4)
9188
listen (3.9.0)
9289
rb-fsevent (~> 0.10, >= 0.10.3)
9390
rb-inotify (~> 0.9, >= 0.9.10)
91+
logger (1.7.0)
9492
mercenary (0.4.0)
95-
net-http (0.4.1)
96-
uri
97-
octokit (6.1.1)
98-
faraday (>= 1, < 3)
99-
sawyer (~> 0.9)
93+
nokogiri (1.19.0-arm64-darwin)
94+
racc (~> 1.4)
95+
nokogiri (1.19.0-x86_64-linux-gnu)
96+
racc (~> 1.4)
10097
pathutil (0.16.2)
10198
forwardable-extended (~> 2.6)
102-
public_suffix (6.0.0)
103-
rake (13.2.1)
99+
public_suffix (7.0.0)
100+
racc (1.8.1)
101+
rake (13.3.1)
104102
rb-fsevent (0.11.2)
105103
rb-inotify (0.11.1)
106104
ffi (~> 1.0)
107-
rexml (3.4.2)
108-
rouge (4.3.0)
109-
rubyzip (2.3.2)
105+
rexml (3.4.4)
106+
rouge (4.7.0)
110107
safe_yaml (1.0.5)
111-
sass-embedded (1.77.5)
112-
google-protobuf (>= 3.25, < 5.0)
113-
rake (>= 13)
114-
sass-embedded (1.77.5-x64-mingw-ucrt)
115-
google-protobuf (>= 3.25, < 5.0)
116-
sass-embedded (1.77.5-x86_64-darwin)
117-
google-protobuf (>= 3.25, < 5.0)
118-
sawyer (0.9.2)
119-
addressable (>= 2.3.5)
120-
faraday (>= 0.17.3, < 3)
108+
sass-embedded (1.97.1-arm64-darwin)
109+
google-protobuf (~> 4.31)
110+
sass-embedded (1.97.1-x86_64-linux-gnu)
111+
google-protobuf (~> 4.31)
121112
terminal-table (3.0.2)
122113
unicode-display_width (>= 1.1.1, < 3)
123-
unicode-display_width (2.5.0)
124-
uri (0.13.2)
125-
wai-website-plugin (0.2)
126-
jekyll (>= 3.6, < 5.0)
127-
webrick (1.8.2)
114+
unicode-display_width (2.6.0)
115+
webrick (1.9.2)
128116

129117
PLATFORMS
130-
x64-mingw-ucrt
131-
x86_64-darwin-21
118+
arm64-darwin-25
132119
x86_64-linux
133120

134121
DEPENDENCIES
135-
wai-gems!
122+
wai-website-plugin!
123+
wai-website-theme!
124+
125+
CHECKSUMS
126+
addressable (2.8.8) sha256=7c13b8f9536cf6364c03b9d417c19986019e28f7c00ac8132da4eb0fe393b057
127+
base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
128+
bigdecimal (4.0.1) sha256=8b07d3d065a9f921c80ceaea7c9d4ae596697295b584c296fe599dd0ad01c4a7
129+
colorator (1.1.0) sha256=e2f85daf57af47d740db2a32191d1bdfb0f6503a0dfbc8327d0c9154d5ddfc38
130+
concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab
131+
csv (3.3.5) sha256=6e5134ac3383ef728b7f02725d9872934f523cb40b961479f69cf3afa6c8e73f
132+
em-websocket (0.5.3) sha256=f56a92bde4e6cb879256d58ee31f124181f68f8887bd14d53d5d9a292758c6a8
133+
eventmachine (1.2.7) sha256=994016e42aa041477ba9cff45cbe50de2047f25dd418eba003e84f0d16560972
134+
ffi (1.17.3-arm64-darwin) sha256=0c690555d4cee17a7f07c04d59df39b2fba74ec440b19da1f685c6579bb0717f
135+
ffi (1.17.3-x86_64-linux-gnu) sha256=3746b01f677aae7b16dc1acb7cb3cc17b3e35bdae7676a3f568153fb0e2c887f
136+
forwardable-extended (2.6.0) sha256=1bec948c469bbddfadeb3bd90eb8c85f6e627a412a3e852acfd7eaedbac3ec97
137+
google-protobuf (4.33.2-arm64-darwin) sha256=6d0ac185fed18768e5f16338455b1e4b7c38a97fc46f352e709f7a3007b64e1d
138+
google-protobuf (4.33.2-x86_64-linux-gnu) sha256=73cba041477afcac92ff383fcbdec195ea28d96b994876d1deaa944d18f91786
139+
http_parser.rb (0.8.1) sha256=9ae8df145b39aa5398b2f90090d651c67bd8e2ebfe4507c966579f641e11097a
140+
i18n (1.14.8) sha256=285778639134865c5e0f6269e0b818256017e8cde89993fdfcbfb64d088824a5
141+
jekyll (4.4.1) sha256=4c1144d857a5b2b80d45b8cf5138289579a9f8136aadfa6dd684b31fe2bc18c1
142+
jekyll-include-cache (0.2.1) sha256=c7d4b9e551732a27442cb2ce853ba36a2f69c66603694b8c1184c99ab1a1a205
143+
jekyll-paginate (1.1.0) sha256=880aadf4b02529a93541d508c5cbb744f014cbfc071d0263a31f25ec9066eb64
144+
jekyll-redirect-from (0.16.0) sha256=6635cae569ef9b0f90ffb71ec014ba977177fafb44d32a2b0526288d4d9be6db
145+
jekyll-sass-converter (3.0.0) sha256=e2e7674f186e906b9d99b8066e13f9b4d5cb9f806d36f7bc8cf2610053d8c902
146+
jekyll-seo-tag (2.8.0) sha256=3f2ed1916d56f14ebfa38e24acde9b7c946df70cb183af2cb5f0598f21ae6818
147+
jekyll-sitemap (1.4.0) sha256=0de08c5debc185ea5a8f980e1025c7cd3f8e0c35c8b6ef592f15c46235cf4218
148+
jekyll-watch (2.2.1) sha256=bc44ed43f5e0a552836245a54dbff3ea7421ecc2856707e8a1ee203a8387a7e1
149+
json (2.18.0) sha256=b10506aee4183f5cf49e0efc48073d7b75843ce3782c68dbeb763351c08fd505
150+
kramdown (2.5.1) sha256=87bbb6abd9d3cebe4fc1f33e367c392b4500e6f8fa19dd61c0972cf4afe7368c
151+
kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729
152+
liquid (4.0.4) sha256=4fcfebb1a045e47918388dbb7a0925e7c3893e58d2bd6c3b3c73ec17a2d8fdb3
153+
listen (3.9.0) sha256=db9e4424e0e5834480385197c139cb6b0ae0ef28cc13310cfd1ca78377d59c67
154+
logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
155+
mercenary (0.4.0) sha256=b25a1e4a59adca88665e08e24acf0af30da5b5d859f7d8f38fba52c28f405138
156+
nokogiri (1.19.0-arm64-darwin) sha256=0811dfd936d5f6dd3f6d32ef790568bf29b2b7bead9ba68866847b33c9cf5810
157+
nokogiri (1.19.0-x86_64-linux-gnu) sha256=f482b95c713d60031d48c44ce14562f8d2ce31e3a9e8dd0ccb131e9e5a68b58c
158+
pathutil (0.16.2) sha256=e43b74365631cab4f6d5e4228f812927efc9cb2c71e62976edcb252ee948d589
159+
public_suffix (7.0.0) sha256=f7090b5beb0e56f9f10d79eed4d5fbe551b3b425da65877e075dad47a6a1b095
160+
racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
161+
rake (13.3.1) sha256=8c9e89d09f66a26a01264e7e3480ec0607f0c497a861ef16063604b1b08eb19c
162+
rb-fsevent (0.11.2) sha256=43900b972e7301d6570f64b850a5aa67833ee7d87b458ee92805d56b7318aefe
163+
rb-inotify (0.11.1) sha256=a0a700441239b0ff18eb65e3866236cd78613d6b9f78fea1f9ac47a85e47be6e
164+
rexml (3.4.4) sha256=19e0a2c3425dfbf2d4fc1189747bdb2f849b6c5e74180401b15734bc97b5d142
165+
rouge (4.7.0) sha256=dba5896715c0325c362e895460a6d350803dbf6427454f49a47500f3193ea739
166+
safe_yaml (1.0.5) sha256=a6ac2d64b7eb027bdeeca1851fe7e7af0d668e133e8a88066a0c6f7087d9f848
167+
sass-embedded (1.97.1-arm64-darwin) sha256=9da08e5cc569ef62235fc515a87c75a47b0de40d8416c563ba1abfbe60e606d9
168+
sass-embedded (1.97.1-x86_64-linux-gnu) sha256=9a294bb0acb1a539ed19f0e511098a9740b4aab4389e169585e8da1337fbd8b4
169+
terminal-table (3.0.2) sha256=f951b6af5f3e00203fb290a669e0a85c5dd5b051b3b023392ccfd67ba5abae91
170+
unicode-display_width (2.6.0) sha256=12279874bba6d5e4d2728cef814b19197dbb10d7a7837a869bab65da943b7f5a
171+
wai-website-plugin (0.3)
172+
wai-website-theme (1.10)
173+
webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131
136174

137175
BUNDLED WITH
138-
2.5.14
176+
4.0.3

‎_config.yml‎

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,54 +8,41 @@
88
# Site settings
99
title: "Web Accessibility Initiative (WAI)"
1010
email: [email protected]
11-
description: > # this means to ignore newlines until "baseurl:"
11+
description: >
1212
The Website of the World Wide Web Consortium’s Web Accessibility Initiative.
13-
baseurl: "/wai-evaluation-tools-list" # the subpath of your site, e.g. /blog
14-
url: "https://w3c.github.io" # the base hostname & protocol for your site
15-
twitter:
16-
username: w3c_wai
13+
baseurl: "/wai-evaluation-tools-list" # the subpath of your site (for GitHub Pages)
14+
url: "https://w3c.github.io" # the base hostname & protocol for your site (for GitHub Pages)
1715
author: w3c_wai
1816
exclude:
1917
- "_external"
2018
- "Gemfile"
2119
- "Gemfile.lock"
2220
- "README.md"
2321
- "w3c.json"
22+
- "node_modules"
23+
repository: w3c/wai-evaluation-tools-list
24+
branch: master
2425

2526
# Build settings
2627
markdown: kramdown
27-
kramwdown:
28+
kramdown:
2829
toc_levels: 2..3
2930
input: GFM
3031
syntax_highlighter: rouge
3132
highlighter: rouge
32-
repository: w3c/wai-evaluation-tools-list
3333

34-
remote_theme: w3c/wai-website-theme
34+
theme: wai-website-theme
3535

3636
defaults:
3737
-
3838
scope:
3939
path: ""
4040
values:
4141
layout: default
42-
standalone_resource_doc_name: List of Evaluation Tools
42+
github:
43+
repository: w3c/wai-evaluation-tools-list
44+
branch: master
4345
footer: >
4446
<p><strong>Date:</strong> Information on specific tools is updated frequently, as we receive it. In the information for each tool there is a last updated date. The Evaluation Tools List user interface was updated in December 2023. First published in March 2006.</p>
4547
<p><strong>Latest editors and developers:</strong> <a href="https://www.w3.org/People/kevin/">Kevin White</a>, Michel Hansma, and Vera Lange. <strong>Content maintainer:</strong> José Ramón Hilera González. <a href="https://www.w3.org/WAI/ER/tools/acknowledgements">Acknowledgements</a> lists contributors and previous editors, including <a href="https://www.w3.org/groups/wg/eowg/participants/">EOWG participants</a>, Eric Eggert, and Shadi Abou-Zahra.</p>
46-
<p>Developed by the Accessibility Education and Outreach Working Group (<a href="http://www.w3.org/WAI/EO/">EOWG</a>) Developed with support from the <a href="https://www.w3.org/WAI/TIES/">WAI-TIES Project</a> in 2006, updated with support from the <a href="https://www.w3.org/WAI/ACT/">WAI-ACT Project</a> in 2014, and revised in 2023 as part of the <a href="https://www.w3.org/WAI/about/projects/wai-coop/">WAI-CooP project</a>, co-funded by the European Commission.
47-
48-
# -
49-
# scope:
50-
# path: "_business-case"
51-
# values:
52-
# layout: "sidenav"
53-
54-
plugins:
55-
- jekyll-seo-tag
56-
- jekyll-sitemap
57-
- jekyll-redirect-from
58-
- jekyll-include-cache
59-
- jekyll-paginate
60-
- jekyll-remote-theme
61-
- wai-website-plugin
48+
<p>Developed by the Accessibility Education and Outreach Working Group (<a href="http://www.w3.org/WAI/EO/">EOWG</a>) Developed with support from the <a href="https://www.w3.org/WAI/TIES/">WAI-TIES Project</a> in 2006, updated with support from the <a href="https://www.w3.org/WAI/ACT/">WAI-ACT Project</a> in 2014, and revised in 2023 as part of the <a href="https://www.w3.org/WAI/about/projects/wai-coop/">WAI-CooP project</a>, co-funded by the European Commission.

0 commit comments

Comments
 (0)