diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..175d819 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,26 @@ +--- +version: 2 +jobs: + build: + docker: + - image: circleci/ruby:2.6-node + steps: + - checkout + - restore_cache: + keys: + - v1-bundler-{{ checksum "Gemfile.lock" }} + - v1-bundler- + - run: bundle install --path vendor/bundle + - save_cache: + key: v1-bundler-{{ checksum "Gemfile.lock" }} + paths: + - vendor/bundle + - run: make build + - run: make test + + +workflows: + version: 2 + commit: + jobs: + - build diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..d4091f7 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +Gemfile.lock merge=binary linguist-generated diff --git a/Gemfile b/Gemfile index 7b19afc..49efe56 100644 --- a/Gemfile +++ b/Gemfile @@ -26,3 +26,4 @@ end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] +gem 'html-proofer' diff --git a/Gemfile.lock b/Gemfile.lock index c3a8701..5230866 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,12 +3,22 @@ GEM specs: addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - bigdecimal (1.3.4) + bigdecimal (1.4.4) colorator (1.1.0) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.5) + ethon (0.12.0) + ffi (>= 1.3.0) ffi (1.11.3) forwardable-extended (2.6.0) - i18n (0.9.3) + html-proofer (3.15.0) + addressable (~> 2.3) + mercenary (~> 0.3) + nokogumbo (~> 2.0) + parallel (~> 1.3) + rainbow (~> 3.0) + typhoeus (~> 1.3) + yell (~> 2.0) + i18n (1.8.1) concurrent-ruby (~> 1.0) jekyll (3.6.3) addressable (~> 2.4) @@ -21,16 +31,16 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 3) safe_yaml (~> 1.0) - jekyll-feed (0.9.3) + jekyll-feed (0.11.0) jekyll (~> 3.3) - jekyll-money (0.1.1) + jekyll-money (0.1.2) bigdecimal (~> 1.3) jekyll (~> 3.3) money (~> 6.8) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.4.0) - jekyll (~> 3.3) + jekyll-seo-tag (2.6.1) + jekyll (>= 3.3, < 5.0) jekyll-watch (1.5.1) listen (~> 3.0) kramdown (1.17.0) @@ -39,15 +49,22 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - minima (2.3.0) - jekyll (~> 3.5) + mini_portile2 (2.4.0) + minima (2.5.1) + jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - money (6.10.1) - i18n (>= 0.6.4, < 1.0) + money (6.13.7) + i18n (>= 0.6.4, <= 2) + nokogiri (1.10.7) + mini_portile2 (~> 2.4.0) + nokogumbo (2.0.2) + nokogiri (~> 1.8, >= 1.8.4) + parallel (1.19.1) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (4.0.3) + rainbow (3.0.0) rb-fsevent (0.10.3) rb-inotify (0.10.1) ffi (~> 1.0) @@ -58,11 +75,15 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + typhoeus (1.3.1) + ethon (>= 0.9.0) + yell (2.2.1) PLATFORMS ruby DEPENDENCIES + html-proofer jekyll (~> 3.6.3) jekyll-feed (~> 0.6) jekyll-money @@ -70,4 +91,4 @@ DEPENDENCIES tzinfo-data BUNDLED WITH - 1.15.3 + 1.17.2 diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..6a1b77a --- /dev/null +++ b/Makefile @@ -0,0 +1,16 @@ +.PHONY: build cleanup serve setup test + +build: + bundle exec jekyll build + +clean: + rm -rf _site + +setup: + bundle install + +serve: + bundle exec jekyll serve + +test: + bundle exec htmlproofer --disable-external _site diff --git a/README.md b/README.md index ba50ba2..4d674b6 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![CircleCI](https://circleci.com/gh/caciviclab/caciviclab.github.io.svg?style=svg)](https://circleci.com/gh/caciviclab/caciviclab.github.io) + CA Civic Lab ============================= diff --git a/_includes/header.html b/_includes/header.html index c5fd569..9b00689 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -8,12 +8,12 @@ - {% if page.title %}CA Civic Lab: {{ page.title }}{% else %}{{ site.title }}{% endif %} + CA Civic Lab logo, a California grizzly bear {% if page.title %}CA Civic Lab: {{ page.title }}{% else %}{{ site.title }}{% endif %}