From 30fc900f3247e19842cfff675d02c1da0bc21235 Mon Sep 17 00:00:00 2001 From: Indan Zupancic Date: Fri, 8 Dec 2023 10:52:39 +0000 Subject: [PATCH] Update Gem Files Remove specific versions from Gemfile. A specific version can be specified in Gemfile.lock if really necessary. Fix parse errors in .bundle/config by moving the license to .reuse/dep5. Can't remove the copyright statement because the CI license check will fail, this makes `reuse` happy. Bundle config files are a subset of YAML. Bundle uses its own parser that doesn't support this syntax. Bundle only supports config files generated with `bundle config`. Signed-off-by: Indan Zupancic --- .bundle/config | 5 ----- .reuse/dep5 | 1 + Gemfile | 12 ++++++------ 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.bundle/config b/.bundle/config index 6e434c3e0c..9bc01b4c32 100644 --- a/.bundle/config +++ b/.bundle/config @@ -1,8 +1,3 @@ -# Copyright 2021 seL4 Foundation -# -# SPDX-License-Identifier: BSD-2-Clause - --- - BUNDLE_PATH: "vendor/bundle" BUNDLE_DISABLE_SHARED_GEMS: "true" diff --git a/.reuse/dep5 b/.reuse/dep5 index 8e02a5f7b3..88b440270c 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -10,6 +10,7 @@ Source: https://docs.sel4.systems # License: ... Files: Gemfile.lock + .bundle/config Hardware/HiKey/*.patch Hardware/CEI_TK1_SOM/CANBoard/Tegra_CANboard_tofab_v1.zip Copyright: 2020 seL4 Project a Series of LF Projects, LLC. diff --git a/Gemfile b/Gemfile index 730c98edbc..9e06a50e54 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ source "https://rubygems.org" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "~> 4.0.0" +gem "jekyll" # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`. @@ -20,11 +20,11 @@ gem "jekyll", "~> 4.0.0" # If you have any plugins, put them here! # Look here for supported github plugins: https://pages.github.com/versions/ group :jekyll_plugins do - gem "jekyll-titles-from-headings", "0.5.3" - gem "jekyll-relative-links", "0.6.1" - gem "jekyll-optional-front-matter", "0.3.2" - gem "jekyll-sitemap", "1.4.0" - gem 'jekyll-toc', "0.5.2" + gem "jekyll-titles-from-headings" + gem "jekyll-relative-links" + gem "jekyll-optional-front-matter" + gem "jekyll-sitemap" + gem 'jekyll-toc' gem 'jekyll-redirect-from' gem 'jekyll-remote-theme' end