Skip to content

Commit 259923b

Browse files
author
Hubot
committed
Sync changes from upstream repository
1 parent eadb29b commit 259923b

File tree

294 files changed

+2734
-353
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

294 files changed

+2734
-353
lines changed

‎.bowerrc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"directory": "assets/vendor"
3+
}

‎.travis.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
language: ruby
22
rvm:
33
- 2.2.3
4+
before_script:
5+
- script/bootstrap

‎Rakefile‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,23 @@ require 'tmpdir'
33

44
task :default => [:test]
55

6-
desc "Compile the site"
7-
task :compile do
8-
`nanoc compile`
6+
desc 'Builds the site'
7+
task :build do
8+
if ENV['RACK_ENV'] == 'test'
9+
begin
10+
sh 'node_modules/gulp/bin/gulp.js build > build.txt'
11+
rescue StandardError => e
12+
puts 'uh oh'
13+
$stderr.puts `cat build.txt`
14+
raise e
15+
end
16+
else
17+
sh 'node_modules/gulp/bin/gulp.js build'
18+
end
919
end
1020

1121
desc "Test the output"
12-
task :test => [:remove_tmp_dir, :remove_output_dir, :compile, :run_proofer]
22+
task :test => [:remove_tmp_dir, :remove_output_dir, :build, :run_proofer]
1323

1424
desc "Run the HTML-Proofer"
1525
task :run_proofer do
@@ -51,7 +61,7 @@ def commit_message(no_commit_msg = false)
5161
end
5262

5363
desc "Publish to http://developer.github.com"
54-
task :publish, [:no_commit_msg] => [:remove_tmp_dir, :remove_output_dir, :compile] do |t, args|
64+
task :publish, [:no_commit_msg] => [:remove_tmp_dir, :remove_output_dir, :build] do |t, args|
5565
message = commit_message(args[:no_commit_msg])
5666

5767
Dir.mktmpdir do |tmp|

favicon.ico renamed to assets/favicon.ico

File renamed without changes.

static/images/add_github_autodeploy_service.png renamed to assets/images/add_github_autodeploy_service.png

File renamed without changes.

static/images/add_heroku_autodeploy_service.png renamed to assets/images/add_heroku_autodeploy_service.png

File renamed without changes.

static/images/callout-earth-static.png renamed to assets/images/callout-earth-static.png

File renamed without changes.

static/images/cancel.png renamed to assets/images/cancel.png

File renamed without changes.

static/images/[email protected] renamed to assets/images/[email protected]

File renamed without changes.

static/images/deploy-keys.png renamed to assets/images/deploy-keys.png

File renamed without changes.

0 commit comments

Comments
 (0)