diff --git a/.ruby-version b/.ruby-version index 62ae32d58..be94e6f53 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.7 \ No newline at end of file +3.2.2 diff --git a/Dockerfile b/Dockerfile index d2e515bf9..3e187ca2e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.0-slim-bullseye +FROM ruby:3.2.2-slim-bullseye ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ diff --git a/Gemfile b/Gemfile index 0398c7068..f645de66f 100644 --- a/Gemfile +++ b/Gemfile @@ -14,7 +14,6 @@ gem 'jekyll-seo-tag', "~> 2.7.1" group :jekyll_plugins do gem 'jekyll-diagrams' - gem 'jekyll-lunr-js-search', :git => 'https://github.com/memfault/jekyll-lunr-js-search.git', :ref => '497e6c31849162d74872ec421017f364fd84b7c4' end gem "jekyll-target-blank", "~> 2.0" diff --git a/Gemfile.lock b/Gemfile.lock index 5e3b0ee66..7d7284ed3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,32 +1,21 @@ -GIT - remote: https://github.com/memfault/jekyll-lunr-js-search.git - revision: 497e6c31849162d74872ec421017f364fd84b7c4 - ref: 497e6c31849162d74872ec421017f364fd84b7c4 - specs: - jekyll-lunr-js-search (3.3.0) - execjs (~> 2.7) - json (~> 2.0) - nokogiri (~> 1.7) - GEM remote: https://rubygems.org/ specs: - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) colorator (1.1.0) - concurrent-ruby (1.1.9) - deep_merge (1.2.1) - em-websocket (0.5.2) + concurrent-ruby (1.3.4) + deep_merge (1.2.2) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) + http_parser.rb (~> 0) eventmachine (1.2.7) - execjs (2.8.1) - ffi (1.15.4) + ffi (1.17.0) forwardable-extended (2.6.0) - http_parser.rb (0.6.0) - i18n (1.8.10) + http_parser.rb (0.8.0) + i18n (1.14.6) concurrent-ruby (~> 1.0) - jekyll (4.2.1) + jekyll (4.2.2) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -49,47 +38,46 @@ GEM deep_merge (~> 1.2) jekyll (>= 3.0) jekyll-paginate (1.1.0) - jekyll-sass-converter (2.1.0) + jekyll-sass-converter (2.2.0) sassc (> 2.0.1, < 3.0) jekyll-seo-tag (2.7.1) jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) - jekyll-target-blank (2.0.0) + jekyll-target-blank (2.0.2) jekyll (>= 3.0, < 5.0) nokogiri (~> 1.10) jekyll-watch (2.2.1) listen (~> 3.0) - json (2.6.3) - kramdown (2.3.1) + kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - liquid (4.0.3) - listen (3.7.0) + 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) - mini_portile2 (2.8.4) - nokogiri (1.15.3) + mini_portile2 (2.8.7) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.6) - racc (1.7.1) - rb-fsevent (0.11.0) - rb-inotify (0.10.1) + public_suffix (6.0.1) + racc (1.8.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.2.5) - rouge (3.26.1) + rexml (3.3.9) + rouge (3.30.0) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) unicode-display_width (1.8.0) - webrick (1.7.0) + webrick (1.8.2) PLATFORMS ruby @@ -99,7 +87,6 @@ DEPENDENCIES jekyll-diagrams jekyll-feed (~> 0.15.1) jekyll-get-json (~> 1.0) - jekyll-lunr-js-search! jekyll-paginate (~> 1.1) jekyll-seo-tag (~> 2.7.1) jekyll-sitemap (~> 1.4) diff --git a/_includes/script.html b/_includes/script.html index 6539affa6..b8b1d953f 100644 --- a/_includes/script.html +++ b/_includes/script.html @@ -3,20 +3,3 @@ - -{% if jekyll.environment == "production" %} - - -{% endif %} - - diff --git a/_includes/search.html b/_includes/search.html index 29d05348a..c4d3c982b 100644 --- a/_includes/search.html +++ b/_includes/search.html @@ -2,38 +2,9 @@ - + + - - - -{% raw %} - -{% endraw %} - - diff --git a/_posts/2019-08-27-building-a-cli-for-firmware-projects.md b/_posts/2019-08-27-building-a-cli-for-firmware-projects.md index a8a913aa4..a96846b3b 100644 --- a/_posts/2019-08-27-building-a-cli-for-firmware-projects.md +++ b/_posts/2019-08-27-building-a-cli-for-firmware-projects.md @@ -321,7 +321,7 @@ overridden by our environment, and now we can define this variable ourselves from our Invoke task! ``` -# ⁨nRF5_SDK_15.2.0/components⁩/toolchain⁩/gcc⁩/Makefile.common +# nRF5_SDK_15.2.0/components/toolchain/gcc/Makefile.common CCACHE ?= $(if $(filter Windows%,$(OS)),, \ $(if $(wildcard /usr/bin/ccache),ccache)) diff --git a/_sass/layout.scss b/_sass/layout.scss index c5ff5a1eb..8c8d53680 100644 --- a/_sass/layout.scss +++ b/_sass/layout.scss @@ -418,7 +418,6 @@ footer { right: 15px; width: 18px; height: 18px; - background-image: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='iso-8859-1'%3F%3E%3Csvg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' viewBox='0 0 512 512' style='enable-background:new 0 0 512 512;' xml:space='preserve'%3E%3Cpath d='M225.474,0C101.151,0,0,101.151,0,225.474c0,124.33,101.151,225.474,225.474,225.474 c124.33,0,225.474-101.144,225.474-225.474C450.948,101.151,349.804,0,225.474,0z M225.474,409.323 c-101.373,0-183.848-82.475-183.848-183.848S124.101,41.626,225.474,41.626s183.848,82.475,183.848,183.848 S326.847,409.323,225.474,409.323z'/%3E%3Cpath d='M505.902,476.472L386.574,357.144c-8.131-8.131-21.299-8.131-29.43,0c-8.131,8.124-8.131,21.306,0,29.43l119.328,119.328 c4.065,4.065,9.387,6.098,14.715,6.098c5.321,0,10.649-2.033,14.715-6.098C514.033,497.778,514.033,484.596,505.902,476.472z'/%3E%3C/svg%3E%0A"); background-repeat: no-repeat; background-size: contain; } diff --git a/js/main.js b/js/main.js index b89190e38..d25f75166 100644 --- a/js/main.js +++ b/js/main.js @@ -56,22 +56,6 @@ function darkModeSetup() { }) } -// Ensures backward compatibility with IE old versions -function searchScroll() { - const scrollBox = document.getElementById('search-results'); - const SCROLLED_CLASSNAME = 'scrolled-down'; - - if (document.addEventListener && scrollBox) { - scrollBox.addEventListener('scroll', () => { - if (scrollBox.scrollTop > 50) { - scrollBox.classList.add(SCROLLED_CLASSNAME); - } else { - scrollBox.classList.remove(SCROLLED_CLASSNAME); - } - }); - } -} - // Function to set a cookie function setCookie(name, value, days) { const expires = new Date(); diff --git a/readme.md b/readme.md index 5e0adefc7..778c3f3a6 100644 --- a/readme.md +++ b/readme.md @@ -36,8 +36,9 @@ You can now access the server at [http://0.0.0.0:4000](http://0.0.0.0:4000) ### Locally You'll need: + - Python 3.8 or later -- Ruby 2.7.7 +- Ruby 3.2.2 #### Install Dependencies