Merge pull request #379 from plone/gaarbas-docs-build-fix

fixing documentation build
plone · Apr 25, 2014 · a993db8 · a993db8 · mister-roboto · Apr 25, 2014
2 parents cd5e756 + 4f438d2
commit a993db8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -30,7 +30,6 @@ after_success:
   - if [ "$BROWSERS" == "SL_Chrome,SL_Firefox" ] && [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then make publish-docs; fi
   - if [ "$BROWSERS" == "SL_Chrome,SL_Firefox" ] && [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then make publish-widgets; fi
   - if [ "$BROWSERS" == "SL_Chrome,SL_Firefox" ] && [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then make publish-structure; fi
-  - if [ "$BROWSERS" == "SL_Chrome,SL_Firefox" ] && [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then make publish-barceloneta; fi
   - if [ "$BROWSERS" == "SL_Chrome,SL_Firefox" ] && [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then make publish-plone; fi
   - if [ "$BROWSERS" == "SL_Chrome,SL_Firefox" ]; then ./node_modules/.bin/lcov-result-merger "coverage/**/lcov.info" | ./node_modules/.bin/coveralls; fi
 matrix:

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -19,9 +19,12 @@ module.exports = function(grunt) {
       docs: {
         files: [
           { expand: true, src: 'index.html', dest: 'docs/dev/' },
+          { expand: true, src: '*.md', dest: 'docs/dev/' },
           { expand: true, src: 'js/**', dest: 'docs/dev/' },
+          { expand: true, src: 'tests/**', dest: 'docs/dev/' },
           { expand: true, src: 'lib/**', dest: 'docs/dev/' },
           { expand: true, src: 'bower_components/**', dest: 'docs/dev/' },
+          { expand: true, src: 'node_modules/requirejs/require.js', dest: 'docs/dev/' },
           { expand: true, src: 'build/**', dest: 'docs/dev/' },
           { expand: true, src: 'less/**', dest: 'docs/dev/' }
         ]
@@ -30,8 +33,8 @@ module.exports = function(grunt) {
     sed: {
       'docs-css': {
         path: 'docs/dev/index.html',
-        pattern: '<style type="text/less">@import "less/docs.less";@isBrowser: true;</style>',
-        replacement: '<link rel="stylesheet" type="text/css" href="docs.min.css" />'
+        pattern: 'href="docs/dev/docs.min.css"',
+        replacement: 'href="docs.min.css"'
       },
       'docs-js': {
         path: 'docs/dev/index.html',