Fixed the bower release process

This commit is contained in:
Spencer Alger
2014-02-06 14:55:28 -07:00
parent 5c3e17c6d0
commit 8530ebb48b
6 changed files with 6 additions and 5 deletions

1
.gitignore vendored
View File

@ -10,6 +10,7 @@ test/integration/yaml_suite/log
test/integration/yaml_suite/yaml_tests*.json test/integration/yaml_suite/yaml_tests*.json
test/integration/yaml_suite/index*.js test/integration/yaml_suite/index*.js
src/elasticsearch*/ src/elasticsearch*/
src/bower*/
junit-*.xml junit-*.xml
elasticsearch*.log elasticsearch*.log
sauce_connect.lo* sauce_connect.lo*

View File

@ -8,7 +8,7 @@ module.exports = function (grunt) {
init: true, init: true,
config: { config: {
distDir: __dirname + '/dist', distDir: __dirname + '/dist',
bowerSubmodule: __dirname + '/src/bower-elasticsearch-js', bowerSubmodule: __dirname + '/src/bower_es_js',
meta: { meta: {
banner: '/*! <%= package.name %> - v<%= package.version %> - ' + banner: '/*! <%= package.name %> - v<%= package.version %> - ' +
'<%= grunt.template.today("yyyy-mm-dd") %>\n' + '<%= grunt.template.today("yyyy-mm-dd") %>\n' +

View File

@ -31,7 +31,7 @@ module.exports = function (grunt) {
'browser_clients:build', 'browser_clients:build',
'run:clone_bower_repo', 'run:clone_bower_repo',
'copy:dist_to_bower', 'copy:dist_to_bower',
'run:release_bower_subm_tag' 'run:release_bower_tag'
]); ]);
grunt.registerTask('_upload_archive', function (type) { grunt.registerTask('_upload_archive', function (type) {

View File

@ -1,7 +1,7 @@
module.exports = { module.exports = {
source: { source: {
src: [ src: [
'src/**/*.js -src/elasticsearch*/**/* -src/bower-elasticsearch-js/**/*', 'src/**/*.js -src/elasticsearch*/**/* -<%= bowerSubmodule %>/**/*',
'scripts/**/*.js', 'scripts/**/*.js',
'test/**/*.js -test/browser_integration/yaml_tests.js', 'test/**/*.js -test/browser_integration/yaml_tests.js',
'grunt/**/*.js', 'grunt/**/*.js',

View File

@ -32,7 +32,7 @@ var config = {
clone_bower_repo: { clone_bower_repo: {
exec: [ exec: [
'test -d src/bower_es_js', 'test -d src/bower_es_js',
'git clone git@github.com:elasticsearch/bower-elasticsearch-js.git src/bower_es_js' 'git clone git@github.com:elasticsearch/bower-elasticsearch-js.git <%= bowerSubmodule %>'
].join(' || '), ].join(' || '),
options: { options: {
quiet: true quiet: true

View File

@ -4,7 +4,7 @@ var async = require('async');
var _ = require('lodash'); var _ = require('lodash');
var root = require('path').join(__dirname, '../..'); var root = require('path').join(__dirname, '../..');
var bowerDir = root + '/src/bower-elasticsearch-js'; var bowerDir = root + '/src/bower_es_js';
// get both the bower and node package files // get both the bower and node package files
var bowerJson = require(bowerDir + '/bower.json'); var bowerJson = require(bowerDir + '/bower.json');