Commitc0f8242

Hubot

committed

Sync changes from upstream repository

1 parent00da7b8 commitc0f8242Copy full SHA for c0f8242

File tree

+15

-2

lines changed

+15

-2

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@`
`12`	`12`	`!/assets/vendor/lunr.js/lunr.js`
`13`	`13`	`!/assets/vendor/lunr.js/lunr.min.js`
`14`	`14`
	`15`	`+_site/`
	`16`	`+enterprise/`
`15`	`17`	`output`
`16`	`18`	`tmp`
`17`	`19`	`.DS_Store`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,10 @@ task :build do`
`20`	`20`	`end`
`21`	`21`	`end`
`22`	`22`
	`23`	`+task:build_latest_entdo`
	`24`	`+putssh"script/enterprise-backport#{config[:versions].first} --keep"`
	`25`	`+end`
	`26`	`+`
`23`	`27`	`desc"Test the output"`
`24`	`28`	`task:test=>[:remove_tmp_dir,:remove_output_dir,:build]do`
`25`	`29`	`Rake::Task['spec'].invoke`
`@@ -80,6 +84,9 @@ end`
`80`	`84`	`namespace:assetsdo`
`81`	`85`	`task:precompile=>[:build]do`
`82`	`86`	`sh'mv output _site/'`
	`87`	`+Rake::Task['build_latest_ent'].invoke`
	`88`	`+sh"mkdir -p _site/enterprise/#{config[:versions].first}"`
	`89`	`+sh"mv output/* _site/enterprise/#{config[:versions].first}"`
`83`	`90`	`end`
`84`	`91`	`end`
`85`	`92`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ data_variables:`
`52`	`52`	`Nanoc::Int::SiteLoader.new.new_with_config(versioned_config).compile`
`53`	`53`
`54`	`54`	puts`node_modules/gulp/bin/gulp.js assets`
`55`		`-failunless $CHILD_STATUS.to_i ==0`
	`55`	`+raiseunless $CHILD_STATUS.to_i ==0`
`56`	`56`
`57`	`57`	`versioned_config`
`58`	`58`	`end`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+require'yaml'`
`1`	`2`	`require'json'`
`2`	`3`	`require'active_support/core_ext/hash'`
`3`	`4`
`@@ -8,4 +9,3 @@ end`
`8`	`9`	`defsymbolize_hash(hash)`
`9`	`10`	`hash.deep_symbolize_keys`
`10`	`11`	`end`
`11`		`-`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -131,3 +131,7 @@ def cleanup`
`131`	`131`	`FileUtils.rm_rf"#{VERSIONED_ENT_PATH}/assets/vendor"`
`132`	`132`	`FileUtils.rm_rf"#{VERSIONED_ENT_PATH}/assets/images"`
`133`	`133`	`end`
	`134`	`+`
	`135`	`+defkeep?`
	`136`	`+ARGV.include?('--keep')`
	`137`	`+end`

Comments

(0)