From b3516f78ea70b5fe0882e265e1d3f7d2c4bf19b9 Mon Sep 17 00:00:00 2001 From: Howard Edwards Date: Thu, 27 Jun 2024 09:55:37 -0400 Subject: [PATCH 1/4] Update ruby build version to 3.3 --- .github/workflows/build-only.yml | 4 ++-- .github/workflows/deploy.yml | 4 ++-- _config.yml | 2 +- netlify.toml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-only.yml b/.github/workflows/build-only.yml index ae37c11b806..8766fab2a0b 100644 --- a/.github/workflows/build-only.yml +++ b/.github/workflows/build-only.yml @@ -16,10 +16,10 @@ jobs: with: submodules: true fetch-depth: 0 - - name: Set up Ruby 2.6 + - name: Set up Ruby 3.3 uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6.2 + ruby-version: 3.3 bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Update Externals run: | diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4d2be9a5514..76b6bbb3b7e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -17,10 +17,10 @@ jobs: with: submodules: true fetch-depth: 0 - - name: Set up Ruby 2.6.2 + - name: Set up Ruby 3.3 uses: ruby/setup-ruby@v1 with: - ruby-version: '2.6.2' # matches Netlify of ruby version + ruby-version: '3.3' # matches Netlify of ruby version bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Update Externals run: | diff --git a/_config.yml b/_config.yml index 49923faa391..d4cc1e22ef4 100755 --- a/_config.yml +++ b/_config.yml @@ -31,7 +31,7 @@ exclude: - "vendor" # Build settings markdown: kramdown -kramwdown: +kramdown: toc_levels: 2..3 input: GFM syntax_highlighter: rouge diff --git a/netlify.toml b/netlify.toml index 8da1e6bd406..8d446418e3e 100644 --- a/netlify.toml +++ b/netlify.toml @@ -4,7 +4,7 @@ command = "git submodule update --init --remote && npm install && bundle exec je publish = "_site" [build.environment] -RUBY_VERSION = "2.6.2" +RUBY_VERSION = "3.3" [[redirects]] from = "/wai-website" From 3ab51a33996b5069f9dd5a710b34b07365523e0a Mon Sep 17 00:00:00 2001 From: Howard Edwards Date: Thu, 27 Jun 2024 10:26:23 -0400 Subject: [PATCH 2/4] Use wai-website-data remove-rouge branch --- .gitmodules | 2 +- Gemfile.lock | 70 ++++++++++++++++++++++++++++---------------------- _external/data | 2 +- 3 files changed, 41 insertions(+), 33 deletions(-) diff --git a/.gitmodules b/.gitmodules index 65ab80564ca..6f285f56aaa 100755 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "_external/data"] path = _external/data url = https://github.com/w3c/wai-website-data.git - branch = master + branch = remove-rouge [submodule "_external/resources/wai-policies-prototype"] path = _external/resources/wai-policies-prototype url = https://github.com/w3c/wai-policies-prototype.git diff --git a/Gemfile.lock b/Gemfile.lock index 48285f35815..b1b76193fca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,30 +10,33 @@ PATH jekyll-remote-theme jekyll-seo-tag jekyll-sitemap - rouge (= 3.30.0) wai-website-plugin GEM remote: https://rubygems.org/ specs: - addressable (2.8.1) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + bigdecimal (3.1.8) colorator (1.1.0) - concurrent-ruby (1.1.10) + concurrent-ruby (1.3.3) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - faraday (2.6.0) - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.1) - ffi (1.15.5) + faraday (2.9.2) + faraday-net_http (>= 2.0, < 3.2) + faraday-net_http (3.1.0) + net-http + ffi (1.17.0-x86_64-linux-gnu) forwardable-extended (2.6.0) + google-protobuf (4.27.2-x86_64-linux) + bigdecimal + rake (>= 13) http_parser.rb (0.8.0) - i18n (1.12.0) + i18n (1.14.5) concurrent-ruby (~> 1.0) - jekyll (4.3.1) + jekyll (4.3.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -51,23 +54,23 @@ GEM webrick (~> 1.7) jekyll-feed (0.17.0) jekyll (>= 3.7, < 5.0) - jekyll-github-metadata (2.15.0) + jekyll-github-metadata (2.16.1) jekyll (>= 3.4, < 5.0) - octokit (~> 4.0, != 4.4.0) + octokit (>= 4, < 7, != 4.4.0) jekyll-include-cache (0.2.1) jekyll (>= 3.7, < 5.0) jekyll-paginate (1.1.0) jekyll-redirect-from (0.16.0) jekyll (>= 3.3, < 5.0) - jekyll-relative-links (0.6.1) + jekyll-relative-links (0.7.0) jekyll (>= 3.3, < 5.0) jekyll-remote-theme (0.4.3) addressable (~> 2.0) jekyll (>= 3.5, < 5.0) jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0) rubyzip (>= 1.3.0, < 3.0) - jekyll-sass-converter (2.2.0) - sassc (> 2.0.1, < 3.0) + jekyll-sass-converter (3.0.0) + sass-embedded (~> 1.54) jekyll-seo-tag (2.8.0) jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) @@ -78,39 +81,44 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - liquid (4.0.3) - listen (3.7.1) + liquid (4.0.4) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) - nokogiri (1.13.10-x86_64-linux) + net-http (0.4.1) + uri + nokogiri (1.16.6-x86_64-linux) racc (~> 1.4) - octokit (4.25.1) + octokit (6.1.1) faraday (>= 1, < 3) sawyer (~> 0.9) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (5.0.0) - racc (1.6.1) + public_suffix (6.0.0) + racc (1.8.0) + rake (13.2.1) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.2.5) - rouge (3.30.0) - ruby2_keywords (0.0.5) + rexml (3.3.1) + strscan + rouge (4.3.0) rubyzip (2.3.2) safe_yaml (1.0.5) - sassc (2.4.0) - ffi (~> 1.9) + sass-embedded (1.77.5-x86_64-linux-gnu) + google-protobuf (>= 3.25, < 5.0) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) + strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - unicode-display_width (2.3.0) + unicode-display_width (2.5.0) + uri (0.13.0) wai-website-plugin (0.2) jekyll (>= 3.6, < 5.0) - webrick (1.7.0) + webrick (1.8.1) PLATFORMS x86_64-linux @@ -121,4 +129,4 @@ DEPENDENCIES wai-gems! BUNDLED WITH - 2.3.10 + 2.5.14 diff --git a/_external/data b/_external/data index 84aa13736ca..ec45f174c8f 160000 --- a/_external/data +++ b/_external/data @@ -1 +1 @@ -Subproject commit 84aa13736ca0171d3bf1355b573b8985d4eb67ca +Subproject commit ec45f174c8fe152862b5658019f773879cdd028b From b1455e5c046afe81f70b9d90229b53553b2bb526 Mon Sep 17 00:00:00 2001 From: Howard Edwards Date: Thu, 27 Jun 2024 10:45:30 -0400 Subject: [PATCH 3/4] Satisfy rvm precision --- .github/workflows/build-only.yml | 2 +- .github/workflows/deploy.yml | 2 +- netlify.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-only.yml b/.github/workflows/build-only.yml index 8766fab2a0b..fb72b9349c3 100644 --- a/.github/workflows/build-only.yml +++ b/.github/workflows/build-only.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Ruby 3.3 uses: ruby/setup-ruby@v1 with: - ruby-version: 3.3 + ruby-version: 3.3.3 bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Update Externals run: | diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 76b6bbb3b7e..bfb61072710 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -20,7 +20,7 @@ jobs: - name: Set up Ruby 3.3 uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3' # matches Netlify of ruby version + ruby-version: '3.3.3' # matches Netlify of ruby version bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Update Externals run: | diff --git a/netlify.toml b/netlify.toml index 8d446418e3e..576339466f5 100644 --- a/netlify.toml +++ b/netlify.toml @@ -4,7 +4,7 @@ command = "git submodule update --init --remote && npm install && bundle exec je publish = "_site" [build.environment] -RUBY_VERSION = "3.3" +RUBY_VERSION = "3.3.3" [[redirects]] from = "/wai-website" From da7faae229d461afd02af94622d1120f96664aaf Mon Sep 17 00:00:00 2001 From: Howard Edwards Date: Tue, 2 Jul 2024 10:21:28 -0400 Subject: [PATCH 4/4] Update .gitmodules and _external/data --- .gitmodules | 2 +- _external/data | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index f809c7c0fb1..6f46148bc3d 100755 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "_external/data"] path = _external/data url = https://github.com/w3c/wai-website-data.git - branch = remove-rouge + branch = master [submodule "_external/resources/wai-policies-prototype"] path = _external/resources/wai-policies-prototype url = https://github.com/w3c/wai-policies-prototype.git diff --git a/_external/data b/_external/data index ec45f174c8f..bb133639268 160000 --- a/_external/data +++ b/_external/data @@ -1 +1 @@ -Subproject commit ec45f174c8fe152862b5658019f773879cdd028b +Subproject commit bb1336392685c5dec9dbf30c5fb5c9e0c0c9260d