myheats-website

commit 57245ea1955c11d736d0fceb4c5d6f168a37661b
parent 157caf2343b6d3dfdc4f39fcbffb0d4a4d1201a3
Author: Heiswayi Nrird <heiswayi@users.noreply.github.com>
Date:   Mon,  2 Mar 2020 17:14:07 +0800

Merge pull request #34 from donvipre/exclude_gemspec

Add: thinkspace.gemspec to exclude list in _config.yml
Diffstat:
M
.travis.yml
 | 
2
+-
M
_config.yml
 | 
20
+++++++++++++++++++-
M
script/cibuild.sh
 | 
2
+-
M
thinkspace.gemspec
 | 
2
+-

4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.4.1
+  - 2.6.0
 
 before_script:
   - chmod +x ./script/cibuild.sh
diff --git a/_config.yml b/_config.yml
@@ -42,4 +42,22 @@ navbar:
   - slug : blog
     title: Blog
 
-exclude: ["gulp", "node_modules", "bower", "bower_components", "config.rb", "src", "Gemfile", "Gemfile.lock", ".rvmrc", ".rbenv-version", "package.json", "gulpfile.js", "README.md", "Rakefile", "changelog.md", "script", "vendor"]
+exclude:
+  - "gulp"
+  - "node_modules"
+  - "bower"
+  - "bower_components"
+  - "config.rb"
+  - "src"
+  - "Gemfile"
+  - "Gemfile.lock"
+  - ".rvmrc"
+  - ".rbenv-version"
+  - "package.json"
+  - "gulpfile.js"
+  - "README.md"
+  - "Rakefile"
+  - "changelog.md"
+  - "script"
+  - "vendor"
+  - "thinkspace.gemspec"
diff --git a/script/cibuild.sh b/script/cibuild.sh
@@ -2,4 +2,4 @@
 set -e # halt script on error
 
 bundle exec jekyll build
-bundle exec htmlproofer ../_site --disable-external
+bundle exec htmlproofer _site --disable-external --allow-hash-href
diff --git a/thinkspace.gemspec b/thinkspace.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
 
 	spec.files         = `git ls-files -z`.split("\x0").select { |f| f.match(%r!^(assets|_layouts|_includes|_sass|(LICENSE|README)((\.(txt|md|markdown)|$)))!i) }
 
-	spec.add_runtime_dependency "jekyll", "~> 3.5"
+	spec.add_runtime_dependency "jekyll", "~> 4.0.0"
 
 	#spec.add_development_dependency "bundler", "~> 2.0.1"
 	spec.add_development_dependency "rake", "~> 12.0"