From f941a392967c2d9e2efc35c03c62eca1a79f1c2c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2025 21:27:24 +0000 Subject: [PATCH 1/5] Bump jekyll from 4.3.4 to 4.4.1 in /site Bumps [jekyll](https://github.com/jekyll/jekyll) from 4.3.4 to 4.4.1. - [Release notes](https://github.com/jekyll/jekyll/releases) - [Changelog](https://github.com/jekyll/jekyll/blob/master/History.markdown) - [Commits](https://github.com/jekyll/jekyll/compare/v4.3.4...v4.4.1) --- updated-dependencies: - dependency-name: jekyll dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- site/Gemfile | 2 +- site/Gemfile.lock | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/site/Gemfile b/site/Gemfile index 0a31a6a..a91d04c 100644 --- a/site/Gemfile +++ b/site/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem "jekyll", "~> 4.3.4" # installed by `gem jekyll` +gem "jekyll", "~> 4.4.1" # installed by `gem jekyll` # gem "webrick" # required when using Ruby >= 3 and Jekyll <= 4.2.2 gem "just-the-docs", "0.10.1" # pinned to the current release diff --git a/site/Gemfile.lock b/site/Gemfile.lock index 55c09ff..756f68b 100644 --- a/site/Gemfile.lock +++ b/site/Gemfile.lock @@ -3,14 +3,17 @@ GEM specs: addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) + base64 (0.2.0) bigdecimal (3.1.9) colorator (1.1.0) concurrent-ruby (1.3.5) + csv (3.3.2) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) ffi (1.17.1) + ffi (1.17.1-x86_64-linux-gnu) forwardable-extended (2.6.0) google-protobuf (4.29.3-x86_64-linux) bigdecimal @@ -18,17 +21,20 @@ GEM http_parser.rb (0.8.0) i18n (1.14.7) concurrent-ruby (~> 1.0) - jekyll (4.3.4) + jekyll (4.4.1) addressable (~> 2.4) + base64 (~> 0.2) colorator (~> 1.0) + csv (~> 3.0) em-websocket (~> 0.5) i18n (~> 1.0) jekyll-sass-converter (>= 2.0, < 4.0) jekyll-watch (~> 2.0) + json (~> 2.6) kramdown (~> 2.3, >= 2.3.1) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (>= 0.3.6, < 0.5) + mercenary (~> 0.3, >= 0.3.6) pathutil (~> 0.9) rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) @@ -44,6 +50,7 @@ GEM jekyll (>= 3.8, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) + json (2.9.1) just-the-docs (0.10.1) jekyll (>= 3.8.5) jekyll-include-cache @@ -71,6 +78,8 @@ GEM sass-embedded (1.83.4) google-protobuf (~> 4.29) rake (>= 13) + sass-embedded (1.83.4-x86_64-linux-gnu) + google-protobuf (~> 4.29) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) unicode-display_width (2.6.0) @@ -80,7 +89,7 @@ PLATFORMS x86_64-linux DEPENDENCIES - jekyll (~> 4.3.4) + jekyll (~> 4.4.1) jekyll-avatar (~> 0.8.0) just-the-docs (= 0.10.1) From fc0959679657414c9fe92a96fc00e2f4b71d2fcd Mon Sep 17 00:00:00 2001 From: fdobad <29801096+fdobad@users.noreply.github.com> Date: Mon, 21 Apr 2025 17:47:08 -0400 Subject: [PATCH 2/5] test --- README.md | 3 ++- site/Gemfile | 1 + site/Gemfile.lock | 30 +++++++++++++++++------------- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 1f05be6..a2b41ba 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ sudo apt-get install ruby-full ruby-bundler jekyll build-essential ``` #### build ``` -cd +cd /site bundle config set --local path 'vendor/bundle' bundle install ``` @@ -56,6 +56,7 @@ ruby -v node -v # clean git clean -dfX -n +git clean -dfX rm Gemfile.lock rm -r .bundle vendor/bundle bundle clean --force diff --git a/site/Gemfile b/site/Gemfile index a91d04c..de9d70e 100644 --- a/site/Gemfile +++ b/site/Gemfile @@ -2,6 +2,7 @@ source 'https://rubygems.org' gem "jekyll", "~> 4.4.1" # installed by `gem jekyll` # gem "webrick" # required when using Ruby >= 3 and Jekyll <= 4.2.2 +gem 'thin' # thin replaced webrick https://stackoverflow.com/a/27654081 gem "just-the-docs", "0.10.1" # pinned to the current release # gem "just-the-docs" # always download the latest release diff --git a/site/Gemfile.lock b/site/Gemfile.lock index 756f68b..d876c14 100644 --- a/site/Gemfile.lock +++ b/site/Gemfile.lock @@ -7,15 +7,15 @@ GEM bigdecimal (3.1.9) colorator (1.1.0) concurrent-ruby (1.3.5) - csv (3.3.2) + csv (3.3.4) + daemons (1.4.1) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.17.1) - ffi (1.17.1-x86_64-linux-gnu) + ffi (1.17.2) forwardable-extended (2.6.0) - google-protobuf (4.29.3-x86_64-linux) + google-protobuf (4.30.2-x86_64-linux) bigdecimal rake (>= 13) http_parser.rb (0.8.0) @@ -44,13 +44,13 @@ GEM jekyll (>= 3.0, < 5.0) jekyll-include-cache (0.2.1) jekyll (>= 3.7, < 5.0) - jekyll-sass-converter (3.0.0) - sass-embedded (~> 1.54) + jekyll-sass-converter (3.1.0) + sass-embedded (~> 1.75) jekyll-seo-tag (2.8.0) jekyll (>= 3.8, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - json (2.9.1) + json (2.10.2) just-the-docs (0.10.1) jekyll (>= 3.8.5) jekyll-include-cache @@ -68,20 +68,23 @@ GEM pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (6.0.1) + rack (2.2.13) rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.4.0) + rexml (3.4.1) rouge (4.5.1) safe_yaml (1.0.5) - sass-embedded (1.83.4) - google-protobuf (~> 4.29) + sass-embedded (1.86.3) + google-protobuf (~> 4.30) rake (>= 13) - sass-embedded (1.83.4-x86_64-linux-gnu) - google-protobuf (~> 4.29) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) + thin (1.8.2) + daemons (~> 1.0, >= 1.0.9) + eventmachine (~> 1.0, >= 1.0.4) + rack (>= 1, < 3) unicode-display_width (2.6.0) webrick (1.9.1) @@ -92,6 +95,7 @@ DEPENDENCIES jekyll (~> 4.4.1) jekyll-avatar (~> 0.8.0) just-the-docs (= 0.10.1) + thin BUNDLED WITH - 2.3.15 + 2.3.26 From ae1a17a392e2707033ea2b2ecb3c833e8bf97b70 Mon Sep 17 00:00:00 2001 From: fdobad <29801096+fdobad@users.noreply.github.com> Date: Mon, 21 Apr 2025 17:53:21 -0400 Subject: [PATCH 3/5] fix ci --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7b5e9b..b92a083 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,5 +18,6 @@ jobs: ruby-version: '3.1' # Not needed with a .ruby-version file bundler-cache: true # runs 'bundle install' and caches installed gems automatically cache-version: 0 # Increment this number if you need to re-download cached gems + working-directory: '${{ github.workspace }}/site' - name: Build with Jekyll - run: bundle exec jekyll build + run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}" From 0f8a97b1d049b5fc0e3c6a4c357c96457b32a87d Mon Sep 17 00:00:00 2001 From: fdobad <29801096+fdobad@users.noreply.github.com> Date: Mon, 21 Apr 2025 17:56:05 -0400 Subject: [PATCH 4/5] fix ci 2 --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b92a083..2e0439e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,4 +20,6 @@ jobs: cache-version: 0 # Increment this number if you need to re-download cached gems working-directory: '${{ github.workspace }}/site' - name: Build with Jekyll - run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}" + run: | + cd site + bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}" From 5adeba5c57ab4caf2b08b47aabfcaa9d6b48abeb Mon Sep 17 00:00:00 2001 From: fdobad <29801096+fdobad@users.noreply.github.com> Date: Mon, 21 Apr 2025 18:02:04 -0400 Subject: [PATCH 5/5] fix main workflow --- .github/workflows/pages.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 4e474a9..9510937 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -46,7 +46,9 @@ jobs: uses: actions/configure-pages@v3 - name: Build with Jekyll # Outputs to the './_site' directory by default - run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}" + run: | + cd site + bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}" env: JEKYLL_ENV: production - name: Upload artifact