Skip to content

Commit 5187faa

Browse files
authored
Merge pull request #422 from ESMValGroup/fix_issue419
remove path flag in Jekyll build
2 parents 9d9ba18 + 93ccaeb commit 5187faa

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

Gemfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,10 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
77
# Synchronize with https://pages.github.com/versions
88
ruby '>=2.5.3'
99

10-
gem 'github-pages', group: :jekyll_plugins
10+
# github-pages conflics with jekyll+liquid, but the site
11+
# builds well locally; github-pages gem is semi-deprecated
12+
# and should not be used as gem anymore, instead use via Actions
13+
# gem 'github-pages', group: :jekyll_plugins
14+
gem 'jekyll', '~> 4.3'
15+
gem 'csv'
16+
gem 'bigdecimal'

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export SHELL = /bin/bash
77
# Settings
88
MAKEFILES=Makefile $(wildcard *.mk)
99
JEKYLL_VERSION=3.8.5
10-
JEKYLL=bundle install --path .vendor/bundle && bundle update && bundle exec jekyll
10+
JEKYLL=bundle install && bundle update --all && bundle exec jekyll
1111
PARSER=bin/markdown_ast.rb
1212
DST=_site
1313

bin/lesson_check.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103

104104
# How long are lines allowed to be?
105105
# Please keep this in sync with .editorconfig!
106-
MAX_LINE_LEN = 100
106+
MAX_LINE_LEN = 170
107107

108108

109109
def main():
@@ -556,7 +556,7 @@ def __init__(self, args, filename, metadata, metadata_len, text, lines, doc):
556556
(re.compile(r'README\.md'), CheckNonJekyll),
557557
(re.compile(r'index\.md'), CheckIndex),
558558
(re.compile(r'reference\.md'), CheckReference),
559-
(re.compile(os.path.join('_episodes', '*\.md')), CheckEpisode),
559+
(re.compile(os.path.join('_episodes', r'*\.md')), CheckEpisode),
560560
(re.compile(r'.*\.md'), CheckGeneric)
561561
]
562562

0 commit comments

Comments
 (0)