Skip to content

Bring compilation down to ~4s #1477

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Jun 5, 2017
Merged

Bring compilation down to ~4s #1477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d5b770
switch to redcarpet markdown compiler for faster compiles
benesch May 30, 2017
0e11cd7
use "standards"-compliant markdown for redcarpet compat
benesch Jun 2, 2017
9f9757a
adjust href hashes for redcarpet's toc generation
benesch Jun 2, 2017
319a339
remove dead code
benesch May 30, 2017
d3006ff
re-add Gemfile
benesch May 30, 2017
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
3 changes: 1 addition & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
*~
.DS_Store
Gemfile.lock
generate/generate
Railroad.jar
.sass-cache
_site
.jekyll-metadata
.jekyll-metadata
7 changes: 7 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# frozen_string_literal: true
source "https://rubygems.org"

gem "html-proofer", "~> 3.7"
gem "jekyll", "~> 3.4"
gem "rake", "~> 12.0.0"
gem "redcarpet", "~> 3.4"
82 changes: 82 additions & 0 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (5.1.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
colorator (1.1.0)
colored (1.2)
concurrent-ruby (1.0.5)
ethon (0.10.1)
ffi (>= 1.3.0)
ffi (1.9.18)
forwardable-extended (2.6.0)
html-proofer (3.7.2)
activesupport (>= 4.2, < 6.0)
addressable (~> 2.3)
colored (~> 1.2)
mercenary (~> 0.3.2)
nokogiri (~> 1.7)
parallel (~> 1.3)
typhoeus (~> 0.7)
yell (~> 2.0)
i18n (0.8.1)
jekyll (3.4.3)
addressable (~> 2.4)
colorator (~> 1.0)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
kramdown (~> 1.3)
liquid (~> 3.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (~> 1.7)
safe_yaml (~> 1.0)
jekyll-sass-converter (1.5.0)
sass (~> 3.4)
jekyll-watch (1.5.0)
listen (~> 3.0, < 3.1)
kramdown (1.13.2)
liquid (3.0.6)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
mercenary (0.3.6)
mini_portile2 (2.1.0)
minitest (5.10.2)
nokogiri (1.7.2)
mini_portile2 (~> 2.1.0)
parallel (1.11.2)
pathutil (0.14.0)
forwardable-extended (~> 2.6)
public_suffix (2.0.5)
rake (12.0.0)
rb-fsevent (0.9.8)
rb-inotify (0.9.8)
ffi (>= 0.5.0)
redcarpet (3.4.0)
rouge (1.11.1)
safe_yaml (1.0.4)
sass (3.4.24)
thread_safe (0.3.6)
typhoeus (0.8.0)
ethon (>= 0.8.0)
tzinfo (1.2.3)
thread_safe (~> 0.1)
yell (2.0.7)

PLATFORMS
ruby

DEPENDENCIES
html-proofer (~> 3.7)
jekyll (~> 3.4)
rake (~> 12.0.0)
redcarpet (~> 3.4)

BUNDLED WITH
1.14.6
11 changes: 8 additions & 3 deletions _config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
project: cockroachdb
topnav_title: CockroachDB
homepage_title: CockroachDB Docs
site_title: Cockroach Labs

url: "https://www.cockroachlabs.com"
baseurl: "/docs"

highlighter: rouge
markdown: kramdown
markdown: redcarpet

redcarpet:
extensions:
- disable_indented_code_blocks
- no_intra_emphasis
- tables
- with_toc_data

exclude: ["set-application-name.md", "vendor"]

Expand Down
7 changes: 0 additions & 7 deletions _includes/custom/conditions.html
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions _includes/custom/doc/customMenu.html
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions _includes/custom/doc/doc_homepage.md
View file
Open in desktop

This file was deleted.

129 changes: 0 additions & 129 deletions _includes/custom/doc/links_doc.html
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions _includes/custom/doc/series_acme.html
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions _includes/custom/doc/series_acme_next.html
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions _includes/linkrefs.html
View file
Open in desktop

This file was deleted.

30 changes: 1 addition & 29 deletions _includes/sidebar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,38 +47,10 @@

</script>

{% include custom/conditions.html %}
{% assign sidebar = site.data.sidebar_doc.entries %}

<ul id="mysidebar" class="nav {% if page.url == '/' or page.url == '/search.html' %}nav--home{% endif %}" style="display: none">
<div class="sidenav-arrow"><img src="images/sidenav-arrow.svg" alt="Sidenav arrow"></div>
<div class="collapsed-header">
{% for entry in sidebar %}
{% for subcategory in entry.subcategories %}
{% for item in subcategory.items %}
{% if page.url == item.url or item.alternate_urls contains page.url%}
<div class="collapsed-header__pre">{{ subcategory.title }}</div>
<div>{{item.title}}</div>
{% else %}
{% for thirdlevel in item.thirdlevel %}
{% for deeplevel in thirdlevel.thirdlevelitems %}
{% if page.url == deeplevel.url or deeplevel.alternate_urls contains page.url %}
<div class="collapsed-header__pre">
{{subcategory.title}}
<div class="arrow-down arrow-down--pre"></div>
{{thirdlevel.title}}
</div>
<div>{{deeplevel.title}}</div>
{% endif %}
{% endfor %}
{% endfor %}
{% endif %}
{% endfor %}
{% endfor %}
{% endfor %}

{% if page.url == '/' or page.url == '/search.html' %}Docs Menu{% endif %}
</div>

<li class="search-wrap">
<div class="search">
<span class="fa fa-search"></span>
Expand Down
4 changes: 2 additions & 2 deletions _includes/sql/diagrams/add_column.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<svg width="884" height="210">
<div><svg width="884" height="210">

<polygon points="11 17 3 13 3 21"></polygon>
<polygon points="19 17 11 13 11 21"></polygon>
Expand Down Expand Up @@ -55,4 +55,4 @@
<path class="line" d="m19 17 h2 m0 0 h10 m62 0 h10 m0 0 h10 m62 0 h10 m20 0 h10 m0 0 h132 m-162 0 h20 m142 0 h20 m-182 0 q10 0 10 10 m162 0 q0 -10 10 -10 m-172 10 v12 m162 0 v-12 m-162 12 q0 10 10 10 m142 0 q10 0 10 -10 m-152 10 h10 m34 0 h10 m0 0 h10 m68 0 h10 m20 -32 h10 m94 0 h10 m2 0 l2 0 m2 0 l2 0 m2 0 l2 0 m-492 142 l2 0 m2 0 l2 0 m2 0 l2 0 m22 0 h10 m48 0 h10 m20 0 h10 m0 0 h88 m-118 0 h20 m98 0 h20 m-138 0 q10 0 10 10 m118 0 q0 -10 10 -10 m-128 10 v12 m118 0 v-12 m-118 12 q0 10 10 10 m98 0 q10 0 10 -10 m-108 10 h10 m78 0 h10 m40 -32 h10 m0 0 h200 m-230 0 h20 m210 0 h20 m-250 0 q10 0 10 10 m230 0 q0 -10 10 -10 m-240 10 v12 m230 0 v-12 m-230 12 q0 10 10 10 m210 0 q10 0 10 -10 m-220 10 h10 m34 0 h10 m0 0 h10 m48 0 h10 m0 0 h10 m68 0 h10 m20 -32 h10 m54 0 h10 m0 0 h10 m82 0 h10 m20 0 h10 m0 0 h130 m-160 0 h20 m140 0 h20 m-180 0 q10 0 10 10 m160 0 q0 -10 10 -10 m-170 10 v12 m160 0 v-12 m-160 12 q0 10 10 10 m140 0 q10 0 10 -10 m-150 10 h10 m120 0 h10 m-812 -32 l20 0 m-1 0 q-9 0 -9 -10 l0 -24 q0 -10 10 -10 m812 44 l20 0 m-20 0 q10 0 10 -10 l0 -24 q0 -10 -10 -10 m-812 0 h10 m24 0 h10 m0 0 h768 m23 44 h-3"></path>
<polygon points="875 159 883 155 883 163"></polygon>
<polygon points="875 159 867 155 867 163"></polygon>
</svg>
</svg></div>
4 changes: 2 additions & 2 deletions _includes/sql/diagrams/add_constraint.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<svg width="762" height="134">
<div><svg width="762" height="134">

<polygon points="9 17 1 13 1 21"></polygon>
<polygon points="17 17 9 13 9 21"></polygon>
Expand Down Expand Up @@ -38,4 +38,4 @@
<path class="line" d="m17 17 h2 m0 0 h10 m62 0 h10 m0 0 h10 m62 0 h10 m20 0 h10 m0 0 h132 m-162 0 h20 m142 0 h20 m-182 0 q10 0 10 10 m162 0 q0 -10 10 -10 m-172 10 v12 m162 0 v-12 m-162 12 q0 10 10 10 m142 0 q10 0 10 -10 m-152 10 h10 m34 0 h10 m0 0 h10 m68 0 h10 m20 -32 h10 m94 0 h10 m0 0 h10 m48 0 h10 m0 0 h10 m108 0 h10 m0 0 h10 m54 0 h10 m2 0 l2 0 m2 0 l2 0 m2 0 l2 0 m-170 98 l2 0 m2 0 l2 0 m2 0 l2 0 m2 0 h10 m120 0 h10 m3 0 h-3"></path>
<polygon points="753 115 761 111 761 119"></polygon>
<polygon points="753 115 745 111 745 119"></polygon>
</svg>
</svg></div>
Loading