From 5e6d01c4917de6724263222408c91835b4022d5a Mon Sep 17 00:00:00 2001 From: Cole Eason Date: Wed, 4 Oct 2023 17:51:33 -0700 Subject: [PATCH 1/4] Set ruby version to avoid 3.2 default or system default --- docs/.ruby-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/.ruby-version diff --git a/docs/.ruby-version b/docs/.ruby-version new file mode 100644 index 000000000000..0aec50e6ede7 --- /dev/null +++ b/docs/.ruby-version @@ -0,0 +1 @@ +3.1.4 From dfeb7bfca2ee9a11a095122b79e9a566944639b5 Mon Sep 17 00:00:00 2001 From: Cole Eason Date: Wed, 4 Oct 2023 18:03:56 -0700 Subject: [PATCH 2/4] Remove ruby version, fix liquid requirement --- docs/.ruby-version | 1 - docs/Gemfile | 2 +- docs/Gemfile.lock | 29 +++++++++++++++-------------- 3 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 docs/.ruby-version diff --git a/docs/.ruby-version b/docs/.ruby-version deleted file mode 100644 index 0aec50e6ede7..000000000000 --- a/docs/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -3.1.4 diff --git a/docs/Gemfile b/docs/Gemfile index 701ae50ca381..91971b594b4f 100644 --- a/docs/Gemfile +++ b/docs/Gemfile @@ -34,4 +34,4 @@ gem "webrick", "~> 1.7" gem 'jekyll-seo-tag' gem 'jekyll-redirect-from' - +gem 'liquid', '~> 4.0.4' diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock index 0963d3c73e6c..27656eeb68f0 100644 --- a/docs/Gemfile.lock +++ b/docs/Gemfile.lock @@ -14,7 +14,7 @@ GEM execjs coffee-script-source (1.11.1) colorator (1.1.0) - commonmarker (0.23.5) + commonmarker (0.23.10) concurrent-ruby (1.1.10) dnsruby (1.61.9) simpleidn (~> 0.1) @@ -32,12 +32,12 @@ GEM ffi (1.15.5) forwardable-extended (2.6.0) gemoji (3.0.1) - github-pages (226) + github-pages (228) github-pages-health-check (= 1.17.9) - jekyll (= 3.9.2) + jekyll (= 3.9.3) jekyll-avatar (= 0.7.0) jekyll-coffeescript (= 1.1.1) - jekyll-commonmark-ghpages (= 0.2.0) + jekyll-commonmark-ghpages (= 0.4.0) jekyll-default-layout (= 0.1.4) jekyll-feed (= 0.15.1) jekyll-gist (= 1.5.0) @@ -71,10 +71,10 @@ GEM jemoji (= 0.12.0) kramdown (= 2.3.2) kramdown-parser-gfm (= 1.1.0) - liquid (= 4.0.3) + liquid (= 4.0.4) mercenary (~> 0.3) minima (= 2.5.1) - nokogiri (>= 1.13.4, < 2.0) + nokogiri (>= 1.13.6, < 2.0) rouge (= 3.26.0) terminal-table (~> 1.4) github-pages-health-check (1.17.9) @@ -89,11 +89,11 @@ GEM http_parser.rb (0.8.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.9.2) + jekyll (3.9.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (~> 0.7) + i18n (>= 0.7, < 2) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 2.0) kramdown (>= 1.17, < 3) @@ -109,11 +109,11 @@ GEM coffee-script-source (~> 1.11.1) jekyll-commonmark (1.4.0) commonmarker (~> 0.22) - jekyll-commonmark-ghpages (0.2.0) - commonmarker (~> 0.23.4) + jekyll-commonmark-ghpages (0.4.0) + commonmarker (~> 0.23.7) jekyll (~> 3.9.0) jekyll-commonmark (~> 1.4.0) - rouge (>= 2.0, < 4.0) + rouge (>= 2.0, < 5.0) jekyll-default-layout (0.1.4) jekyll (~> 3.0) jekyll-feed (0.15.1) @@ -201,7 +201,7 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - liquid (4.0.3) + liquid (4.0.4) listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -211,9 +211,9 @@ GEM jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) minitest (5.16.2) - nokogiri (1.13.10-arm64-darwin) + nokogiri (1.15.4-arm64-darwin) racc (~> 1.4) - nokogiri (1.13.10-x86_64-darwin) + nokogiri (1.15.4-x86_64-darwin) racc (~> 1.4) octokit (4.25.1) faraday (>= 1, < 3) @@ -265,6 +265,7 @@ DEPENDENCIES jekyll-feed (~> 0.12) jekyll-redirect-from jekyll-seo-tag + liquid (~> 4.0.4) tzinfo (~> 1.2) tzinfo-data wdm (~> 0.1.1) From 16fa6f80d638c07d100097180af63a9efd89d8d1 Mon Sep 17 00:00:00 2001 From: Cole Eason Date: Wed, 4 Oct 2023 18:19:14 -0700 Subject: [PATCH 3/4] Set char set in scss --- docs/assets/css/styles.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/assets/css/styles.scss b/docs/assets/css/styles.scss index 271e60fe6611..4c4dab74c062 100644 --- a/docs/assets/css/styles.scss +++ b/docs/assets/css/styles.scss @@ -1,3 +1,4 @@ --- --- +@charset "utf-8"; @import 'main'; From b7e090b9393873da39e226c8106d4be4efbd7c7f Mon Sep 17 00:00:00 2001 From: Cole Eason Date: Wed, 4 Oct 2023 19:12:10 -0700 Subject: [PATCH 4/4] Revert utf change --- docs/assets/css/styles.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/assets/css/styles.scss b/docs/assets/css/styles.scss index 4c4dab74c062..271e60fe6611 100644 --- a/docs/assets/css/styles.scss +++ b/docs/assets/css/styles.scss @@ -1,4 +1,3 @@ --- --- -@charset "utf-8"; @import 'main';