diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7d0bfa77e..9cfeee0ae 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,18 +1,18 @@ name: ci:test -on: [push, pull_request] +on: + push: + branches: [main, development] + pull_request: + branches: [main, development] jobs: test: if: github.repository_owner == 'minicomp' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 1 + - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: bundler-cache: true - - name: install - run: gem install bundler && bundle - name: test run: bundle exec rake wax:test diff --git a/.ruby-version b/.ruby-version index 37c2961c2..be94e6f53 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.2 +3.2.2 diff --git a/Gemfile b/Gemfile index 926b32541..f717337ca 100644 --- a/Gemfile +++ b/Gemfile @@ -3,9 +3,8 @@ source 'https://rubygems.org' gemspec -# Temporarily pin jekyll to avoid absolute_url bug in 4.2 -gem 'jekyll', '4.1' - -# Windows does not include zoneinfo files, so bundle the tzinfo-data gem -gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] -gem 'kramdown-parser-gfm' +platforms :mingw, :x64_mingw, :mswin, :jruby do + gem 'wdm', '~> 0.1.1', :install_if => Gem.win_platform? + gem "tzinfo", ">= 1", "< 3" + gem "tzinfo-data" +end \ No newline at end of file diff --git a/_config.yml b/_config.yml index 6cdc29740..136bc66b5 100644 --- a/_config.yml +++ b/_config.yml @@ -33,12 +33,7 @@ logo: '/assets/logo.png' permalink: 'pretty' sass: style: compressed -exclude: - - Gemfile* - - Rakefile - - vendor - - spec - - README.md +exclude: ["Gemfile*", "*.gemspec", "Rakefile", "vendor", "spec", "README.md", "LICENSE.txt", "Docker*"] incremental: true webrick: headers: diff --git a/_includes/collection_gallery.html b/_includes/collection_gallery.html index d2fc17365..df39a0922 100644 --- a/_includes/collection_gallery.html +++ b/_includes/collection_gallery.html @@ -21,14 +21,14 @@ {% if subset %} {% for item in subset %} {%- capture item_html -%} - "" + "" {%- endcapture -%} gallery.append({{ item_html | strip_newlines }}); {% endfor %} {% else %} {% for item in collection %} {%- capture item_html -%} - "" + "" {%- endcapture -%} gallery.append({{ item_html | strip_newlines }}); {% endfor %} diff --git a/_includes/head.html b/_includes/head.html index 6bfa53532..6af2bbff4 100755 --- a/_includes/head.html +++ b/_includes/head.html @@ -10,5 +10,4 @@ - diff --git a/_layouts/default.html b/_layouts/default.html index a0d8f964f..11e1e3445 100755 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -18,8 +18,7 @@ {% include footer.html %} + + - - - diff --git a/wax_theme.gemspec b/wax_theme.gemspec index 4f9606144..cdb265033 100644 --- a/wax_theme.gemspec +++ b/wax_theme.gemspec @@ -11,8 +11,9 @@ Gem::Specification.new do |spec| spec.files = `git ls-files -z`.split("\x0").select { |f| f.match(%r!^(assets|_layouts|_includes|_sass|LICENSE|README)!i) } - spec.add_runtime_dependency 'jekyll', '~> 4.1' + spec.add_runtime_dependency 'jekyll', '~> 4.3.2' spec.add_runtime_dependency 'wax_tasks', '~> 1.1' + spec.add_runtime_dependency 'webrick', '~> 1.8' spec.add_development_dependency 'html-proofer', '~> 3.15' end