From 9c03701351021804612b8fc47a04f0e2431816ec Mon Sep 17 00:00:00 2001 From: hjh Date: Sun, 8 Sep 2024 10:08:24 +0800 Subject: [PATCH] Fix GitHub Actions for Jekyll 4.x #1276 in beautiful-jekyll --- .github/workflows/ci.yml | 16 ++++++++-------- Appraisals | 6 ++++++ beautiful-jekyll-theme.gemspec | 10 ++++++---- 3 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 Appraisals diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dcb9d5a3b73a..3c6234821c6b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,11 +5,11 @@ jobs: name: Build Jekyll runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Build the site in the jekyll/builder container - run: | - export JEKYLL_VERSION=3.8 - docker run \ - -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \ - -e PAGES_REPO_NWO=${{ github.repository }} \ - jekyll/builder:$JEKYLL_VERSION /bin/bash -c "chmod 777 /srv/jekyll && jekyll build --future" + - uses: actions/checkout@v4 + - uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.3' + - name: Install dependencies + run: bundle install && bundle exec appraisal install + - name: Build site + run: bundle exec appraisal jekyll build --future \ No newline at end of file diff --git a/Appraisals b/Appraisals new file mode 100644 index 000000000000..7b4a0eda2cdc --- /dev/null +++ b/Appraisals @@ -0,0 +1,6 @@ +appraise "jekyll-3" do + gem "jekyll", "3.9.4" +end +appraise "jekyll-4" do + gem "jekyll", "4.3.3" +end \ No newline at end of file diff --git a/beautiful-jekyll-theme.gemspec b/beautiful-jekyll-theme.gemspec index 8ffd66238092..acbd2a0eefce 100644 --- a/beautiful-jekyll-theme.gemspec +++ b/beautiful-jekyll-theme.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |spec| spec.name = "beautiful-jekyll-theme" - spec.version = "5.0.0" + spec.version = "6.0.1" spec.authors = ["Dean Attali"] spec.email = ["daattali@gmail.com"] @@ -17,12 +17,14 @@ Gem::Specification.new do |spec| "documentation_uri" => "https://github.com/daattali/beautiful-jekyll#readme" } - spec.add_runtime_dependency "jekyll", "~> 3.8" + spec.add_runtime_dependency "jekyll", ">= 3.9.3" spec.add_runtime_dependency "jekyll-paginate", "~> 1.1" spec.add_runtime_dependency "jekyll-sitemap", "~> 1.4" spec.add_runtime_dependency "kramdown-parser-gfm", "~> 1.1" - spec.add_runtime_dependency "kramdown", "~> 2.3.0" + spec.add_runtime_dependency "kramdown", "~> 2.3" + spec.add_runtime_dependency "webrick", "~> 1.8" spec.add_development_dependency "bundler", ">= 1.16" spec.add_development_dependency "rake", "~> 12.0" -end + spec.add_development_dependency "appraisal", "~> 2.5" +end \ No newline at end of file