Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI configuration #23

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Gemfile.lock merge=binary linguist-generated
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
45 changes: 33 additions & 12 deletions Gemfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
=============================

Expand Down
4 changes: 2 additions & 2 deletions _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ site.url }}"><img src="{{ "/images/logo.png" | prepend: site.baseurl }}" style="max-height:25px; margin-top: -2px;"></a> <a class="navbar-brand" href="{{ site.url }}">{% if page.title %}CA Civic Lab: {{ page.title }}{% else %}{{ site.title }}{% endif %}</a>
<a class="navbar-brand" href="{{ site.url }}"><img alt="CA Civic Lab logo, a California grizzly bear" src="{{ "/images/logo.png" | prepend: site.baseurl }}" style="max-height:25px; margin-top: -2px;"></a> <a class="navbar-brand" href="{{ site.url }}">{% if page.title %}CA Civic Lab: {{ page.title }}{% else %}{{ site.title }}{% endif %}</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-code-fork"></i> Projects <b class="caret"></b></a>
<a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-code-fork"></i> Projects <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/state-agencies">State Agency Inventory</a></li>
<li><a href="/opendisclosure">OpenDisclosure</a></li>
Expand Down
2 changes: 1 addition & 1 deletion state-agencies/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <h3>Search for an agency:</h3>
{% raw %}
<tr ng-repeat="dept in departments | filter: query">
<td width="60%">
<a ng-if="!!dept.url" href="{{ dept.url }}">{{ dept.name }}</a>
<a ng-if="!!dept.url" href="{{ dept.url }}" data-proofer-ignore>{{ dept.name }}</a>
<span ng-if="!dept.url">{{ dept.name }}</span>
</td>
<td width="10%"><i class="fa fa-circle fa-{{dept.publish}}"></i></li></td>
Expand Down