Skip to content

Commit

Permalink
deps: Fix Jekyll 4.3 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
iBug committed Apr 4, 2023
1 parent b3e0ad7 commit 329eaa3
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fetch-depth: 0
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.0
ruby-version: '3.0'
- uses: actions/setup-node@v3
with:
node-version: 16
Expand Down
25 changes: 25 additions & 0 deletions _plugins/set_posts.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,28 @@
c['posts'].docs.concat c['news'].docs
c['posts'].docs.concat c['planet'].docs
end

# Also monkey-patch `jekyll doctor` command
module Jekyll
module Commands
class Doctor
class << self
def conflicting_urls(site)
conflicting_urls = false
destination_map(site).each do |dest, paths|
next unless paths.uniq.size > 1

conflicting_urls = true
Jekyll.logger.warn "Conflict:",
"The following destination is shared by multiple files."
Jekyll.logger.warn "", "The written file may end up with unexpected contents."
Jekyll.logger.warn "", dest.to_s.cyan
paths.each { |path| Jekyll.logger.warn "", " - #{path}" }
Jekyll.logger.warn ""
end
conflicting_urls
end
end
end
end
end
3 changes: 0 additions & 3 deletions assets/css/main.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
---
---

@charset "utf-8";

@import "skin"; // skin
Expand Down

0 comments on commit 329eaa3

Please sign in to comment.