From b8d9bc2adc8cd54dcb38527306883c599dc44050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Ig=C3=B3n?= Date: Fri, 12 Apr 2024 12:14:13 +0200 Subject: [PATCH 1/4] update workflow --- .github/workflows/jekyll-lint.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/jekyll-lint.yml b/.github/workflows/jekyll-lint.yml index bfab852..66d9091 100644 --- a/.github/workflows/jekyll-lint.yml +++ b/.github/workflows/jekyll-lint.yml @@ -19,15 +19,14 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby-version: ['2.7'] + ruby-version: ['3.3'] steps: - uses: actions/checkout@v2 - name: Set up Ruby # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby, # change this to (see https://github.com/ruby/setup-ruby#versioning): - # uses: ruby/setup-ruby@v1 - uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e + - uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby-version }} bundler-cache: true # runs 'bundle install' and caches installed gems automatically From 98ea24712e10923211bd9963042e17187870d4e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Ig=C3=B3n?= Date: Fri, 12 Apr 2024 12:18:01 +0200 Subject: [PATCH 2/4] fix workflow syntax --- .github/workflows/jekyll-lint.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/jekyll-lint.yml b/.github/workflows/jekyll-lint.yml index 66d9091..b2e3a74 100644 --- a/.github/workflows/jekyll-lint.yml +++ b/.github/workflows/jekyll-lint.yml @@ -7,7 +7,6 @@ name: Jekyll - Install dependencies and run linters - on: push: branches: [ main ] @@ -22,7 +21,7 @@ jobs: ruby-version: ['3.3'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Ruby # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby, # change this to (see https://github.com/ruby/setup-ruby#versioning): @@ -31,4 +30,4 @@ jobs: ruby-version: ${{ matrix.ruby-version }} bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Run rubocop - run: bundle exec rubocop + - run: bundle exec rubocop From fa2180e50192cbcff1575bc7b0789ffc2bf76f78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Ig=C3=B3n?= Date: Fri, 12 Apr 2024 12:26:44 +0200 Subject: [PATCH 3/4] fix workflow syntax --- .github/workflows/jekyll-lint.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/jekyll-lint.yml b/.github/workflows/jekyll-lint.yml index b2e3a74..8bcace9 100644 --- a/.github/workflows/jekyll-lint.yml +++ b/.github/workflows/jekyll-lint.yml @@ -22,12 +22,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Ruby # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby, # change this to (see https://github.com/ruby/setup-ruby#versioning): - uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby-version }} bundler-cache: true # runs 'bundle install' and caches installed gems automatically - - name: Run rubocop - run: bundle exec rubocop From 746b1eb857e2690f09abc4db4036df1a77fef23f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Ig=C3=B3n?= Date: Fri, 12 Apr 2024 12:45:24 +0200 Subject: [PATCH 4/4] set ruby to 3.2 --- .rubocop.yml | 1 + .ruby-version | 1 + jekyll-plugin-platoniq-journal.gemspec | 4 ++-- lib/jekyll-plugin-platoniq-journal/includes_file.rb | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 .ruby-version diff --git a/.rubocop.yml b/.rubocop.yml index 61e273e..c4b6a2c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -3,5 +3,6 @@ inherit_gem: rubocop-jekyll: .rubocop.yml AllCops: + TargetRubyVersion: 3.2 Exclude: - vendor/bundle/**/* diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..944880f --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +3.2.0 diff --git a/jekyll-plugin-platoniq-journal.gemspec b/jekyll-plugin-platoniq-journal.gemspec index 8e1cfdc..61c2a26 100644 --- a/jekyll-plugin-platoniq-journal.gemspec +++ b/jekyll-plugin-platoniq-journal.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |spec| spec.name = "jekyll-plugin-platoniq-journal" - spec.version = "0.0.22" + spec.version = "0.0.23" spec.authors = ["Agustí B.R."] spec.email = ["agusti@platoniq.net"] @@ -13,7 +13,7 @@ Gem::Specification.new do |spec| spec.files = `git ls-files lib`.split("\n").push("LICENSE.txt", "README.md") spec.require_paths = ["lib"] - spec.required_ruby_version = ">= 2.5" + spec.required_ruby_version = ">= 3.2.0" spec.add_dependency "jekyll", "~> 4.2" spec.add_dependency "kramdown", "~> 2.3" diff --git a/lib/jekyll-plugin-platoniq-journal/includes_file.rb b/lib/jekyll-plugin-platoniq-journal/includes_file.rb index 3708019..1868f65 100644 --- a/lib/jekyll-plugin-platoniq-journal/includes_file.rb +++ b/lib/jekyll-plugin-platoniq-journal/includes_file.rb @@ -34,7 +34,7 @@ def realpath_prefixed_with?(path, dir) def could_not_locate_message(file, includes_dirs, safe) message = "Could not locate the included file '#{file}' in any of " \ - "#{includes_dirs}. Ensure it exists in one of those directories and" + "#{includes_dirs}. Ensure it exists in one of those directories and" message + if safe " is not a symlink as those are not allowed in safe mode." else