diff options
Diffstat (limited to 'build')
-rw-r--r-- | build/release.js | 17 | ||||
-rw-r--r-- | build/tasks/build.js | 2 |
2 files changed, 4 insertions, 15 deletions
diff --git a/build/release.js b/build/release.js index 9dfeb8d5b..be9f425cf 100644 --- a/build/release.js +++ b/build/release.js @@ -18,8 +18,6 @@ var releaseVersion, pkg, branch, - sizzleLoc = "bower_modules/sizzle", - scpURL = "jqadmin@code.origin.jquery.com:/var/www/html/code.jquery.com/", cdnURL = "http://code.origin.jquery.com/", repoURL = "git@github.com:jquery/jquery.git", @@ -102,9 +100,6 @@ function initialize( next ) { if ( !exists( "package.json" ) ) { die( "No package.json in this directory" ); } - if ( !exists( sizzleLoc ) ) { - die( "Sizzle expected to exist at " + sizzleLoc ); - } pkg = readJSON( "package.json" ); console.log( "Current version is " + pkg.version + "; generating release " + releaseVersion ); @@ -308,15 +303,9 @@ function commitDistFiles( next ) { // Add files to be committed git( [ "add", "package.json" ], function() { git( [ "commit", "-m", "Remove scripts property from package.json" ], function() { - // Add sizzle in a separate commit to avoid a big diff - // Use force to add normally ignored files - git( [ "add", "-f", sizzleLoc ], function() { - git( [ "commit", "-m", "Add sizzle" ], function() { - // Add jquery files for distribution in a final commit - git( [ "add", "-f", devFile, minFile, mapFile ], function() { - git( [ "commit", "-m", releaseVersion ], next, debug ); - }, debug ); - }, debug ); + // Add jquery files for distribution in a final commit + git( [ "add", "-f", devFile, minFile, mapFile ], function() { + git( [ "commit", "-m", releaseVersion ], next, debug ); }, debug ); }, debug ); }, debug ); diff --git a/build/tasks/build.js b/build/tasks/build.js index cee296f96..aacb5abd8 100644 --- a/build/tasks/build.js +++ b/build/tasks/build.js @@ -26,7 +26,7 @@ module.exports = function( grunt ) { endFile: "src/outro.js" }, paths: { - sizzle: "../bower_modules/sizzle/dist/sizzle" + sizzle: "sizzle/dist/sizzle" }, rawText: {}, onBuildWrite: convert |