[Testbot] Plone 5.0 - Python 2.7 - Build # 2958 - Still failing! - 0 failure(s)
jenkins at plone.org
jenkins at plone.org
Sun Aug 10 09:24:42 UTC 2014
-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 2958 - Still Failing!
-------------------------------------------------------------------------------
http://jenkins.plone.org/job/plone-5.0-python-2.7/2958/
-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------
Repository: mockup
Branch: refs/heads/master
Date: 2014-08-10T10:10:29+02:00
Author: Nathan Van Gheem (vangheem) <vangheem at gmail.com>
Commit: https://github.com/plone/mockup/commit/9558c2a74a5db768aecef2b4e38a670686d227a4
finish removing barceloneta
Files changed:
M Gruntfile.js
M Makefile
M js/config.js
diff --git a/Gruntfile.js b/Gruntfile.js
index db4d483..ab5ad85 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -85,13 +85,6 @@ module.exports = function(grunt) {
mockup.registerBundle('widgets');
mockup.initGrunt(grunt, {
- uglify: {
- barceloneta: {
- files: {
- 'build/barceloneta.js': 'js/bundles/barceloneta_develop.js'
- }
- }
- },
sed: {
bootstrap: {
path: 'node_modules/lcov-result-merger/index.js',
diff --git a/Makefile b/Makefile
index 1a6343f..2f473b3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-GIT = git
+ GIT = git
NPM = npm
GRUNT = ./node_modules/grunt-cli/bin/grunt
@@ -7,10 +7,9 @@ NODE_PATH = ./node_modules
all: test-once bundles docs
-bundles: bundle-barceloneta bundle-widgets bundle-structure bundle-plone
+bundles: bundle-widgets bundle-structure bundle-plone
# ----------------------------------------------------------------------- #
# cp build/widgets* path/to/plone.app.widgets/plone/app/widgets/static
- # cp build/barceloneta* path/to/plonetheme.barceloneta/plonetheme/barceloneta/static
# cp build/structure* path/to/wildcard.foldercontents/wildcard/foldercontents/static
# cp build/plone* path/to/Products.CMFPlone/Products/CMFPlone/static
# ----------------------------------------------------------------------- #
@@ -22,10 +21,6 @@ bundle-widgets:
bundle-structure:
NODE_PATH=$(NODE_PATH) $(GRUNT) bundle-structure
-bundle-barceloneta:
- mkdir -p build
- NODE_PATH=$(NODE_PATH) $(GRUNT) bundle-barceloneta
-
bundle-plone:
mkdir -p build
NODE_PATH=$(NODE_PATH) $(GRUNT) bundle-plone
@@ -79,4 +74,7 @@ clean-deep: clean
if test -f $(BOWER); then $(BOWER) cache clean; fi
if test -f $(NPM); then $(NPM) cache clean; fi
-.PHONY: bundle bundle-widgets bundle-structure bundle-barceloneta bundle-plone docs bootstrap bootstrap-nix jshint test test-once test-dev test-ci publish-widgets publish-structure publish-barceloneta publish-plone publish-docs clean clean-deep
+publish-docs:
+ echo -e "Publishing 'docs' bundle!\n"; cd docs; git add -fA .; git commit -m "Travis build $(TRAVIS_BUILD_NUMBER) pushed to 'docs'."; git push -fq https://$(GH_TOKEN)@github.com/plone/mockup.git gh-pages > /dev/null; cd ..;
+
+.PHONY: bundle bundle-widgets bundle-structure bundle-plone docs bootstrap bootstrap-nix jshint test test-once test-dev test-ci publish-docs clean clean-deep
diff --git a/js/config.js b/js/config.js
index 132ff28..55b5867 100644
--- a/js/config.js
+++ b/js/config.js
@@ -31,7 +31,6 @@
'jquery.event.drop': 'lib/jquery.event.drop',
'jquery.form': 'bower_components/jquery-form/jquery.form',
'marked': 'bower_components/marked/lib/marked',
- 'mockup-bundles-barceloneta': 'js/bundles/barceloneta',
'mockup-bundles-docs': 'js/bundles/docs',
'mockup-bundles-plone': 'js/bundles/plone',
'mockup-bundles-structure': 'js/bundles/structure',
-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 3246 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140810/145a3953/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 93594 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140810/145a3953/attachment-0003.obj>
More information about the Testbot
mailing list