From 9ef09edc797566e81f20682ab93208c9076341b5 Mon Sep 17 00:00:00 2001 From: Jörn Zaefferer Date: Fri, 20 Sep 2013 18:15:55 +0200 Subject: Build: Remove the build task and it's dependencies. Will bring back testing against minified files later. --- build/tasks/build.js | 50 -------------------------------------------------- 1 file changed, 50 deletions(-) (limited to 'build/tasks') diff --git a/build/tasks/build.js b/build/tasks/build.js index c50745899..cdc03bd60 100644 --- a/build/tasks/build.js +++ b/build/tasks/build.js @@ -2,21 +2,6 @@ module.exports = function( grunt ) { "use strict"; -var fs = require( "fs" ); - -function expandFiles( files ) { - return grunt.util._.pluck( grunt.file.expandMapping( files ), "src" ).filter(function(filepath) { - // restrict to files, exclude folders - try { - return fs.statSync( filepath[ 0 ] ).isFile(); - } catch(e) { - throw grunt.task.taskError(e.message, e); - } - }).map(function( values ) { - return values[ 0 ]; - }); -} - grunt.registerTask( "manifest", "Generate jquery.json manifest files", function() { var pkg = grunt.config( "pkg" ), base = { @@ -96,41 +81,6 @@ grunt.registerTask( "manifest", "Generate jquery.json manifest files", function( }); }); -grunt.registerMultiTask( "copy", "Copy files to destination folder and replace @VERSION with pkg.version", function() { - function replaceVersion( source ) { - return source.replace( /@VERSION/g, grunt.config( "pkg.version" ) ); - } - function copyFile( src, dest ) { - if ( /(js|css)$/.test( src ) ) { - grunt.file.copy( src, dest, { - process: replaceVersion - }); - } else { - grunt.file.copy( src, dest ); - } - } - var files = expandFiles( this.filesSrc ), - target = this.data.dest + "/", - strip = this.data.strip, - renameCount = 0, - fileName; - if ( typeof strip === "string" ) { - strip = new RegExp( "^" + grunt.template.process( strip, grunt.config() ).replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ) ); - } - files.forEach(function( fileName ) { - var targetFile = strip ? fileName.replace( strip, "" ) : fileName; - copyFile( fileName, target + targetFile ); - }); - grunt.log.writeln( "Copied " + files.length + " files." ); - for ( fileName in this.data.renames ) { - renameCount += 1; - copyFile( fileName, target + grunt.template.process( this.data.renames[ fileName ], grunt.config() ) ); - } - if ( renameCount ) { - grunt.log.writeln( "Renamed " + renameCount + " files." ); - } -}); - grunt.registerTask( "clean", function() { require( "rimraf" ).sync( "dist" ); }); -- cgit v1.2.3 From 647b839c526d81017db341a1829677fc0e5a27d5 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Wed, 2 Oct 2013 15:33:03 +0200 Subject: Gruntfile: Remove project prefix from TestSwarm job name * Also added a line break to separate the for statement from the testswarm chain. * Passing explicit false instead of empty string as `extra`. --- build/tasks/testswarm.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'build/tasks') diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js index dd9959a62..620c71e4b 100644 --- a/build/tasks/testswarm.js +++ b/build/tasks/testswarm.js @@ -41,12 +41,13 @@ function submit( commit, runs, configFile, extra, done ) { commitUrl = "https://github.com/jquery/jquery-ui/commit/" + commit; if ( extra ) { - extra = " " + extra; + extra = " (" + extra + ")"; } for ( testName in runs ) { runs[ testName ] = config.testUrl + commit + "/tests/unit/" + runs[ testName ]; } + testswarm.createClient({ url: config.swarmUrl, pollInterval: 10000, @@ -58,7 +59,7 @@ function submit( commit, runs, configFile, extra, done ) { token: config.authToken }) .addjob({ - name: "jQuery UI #" + commit.substr( 0, 10 ) + "" + extra, + name: "Commit " + commit.substr( 0, 10 ) + "" + extra, runs: runs, runMax: config.runMax, browserSets: config.browserSets @@ -76,7 +77,7 @@ grunt.registerTask( "testswarm", function( commit, configFile ) { for ( test in tests ) { latestTests[ test ] = tests[ test ] + "?nojshint=true"; } - submit( commit, latestTests, configFile, "", this.async() ); + submit( commit, latestTests, configFile, false, this.async() ); }); grunt.registerTask( "testswarm-multi-jquery", function( commit, configFile, minor ) { -- cgit v1.2.3 From 80b17bb40a1a0956e954d41550ebdf69ee480ae2 Mon Sep 17 00:00:00 2001 From: Scott González Date: Wed, 2 Oct 2013 10:15:32 -0400 Subject: Build: Fixed TestSwarm submission. --- build/tasks/testswarm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build/tasks') diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js index 620c71e4b..2bce06f26 100644 --- a/build/tasks/testswarm.js +++ b/build/tasks/testswarm.js @@ -77,7 +77,7 @@ grunt.registerTask( "testswarm", function( commit, configFile ) { for ( test in tests ) { latestTests[ test ] = tests[ test ] + "?nojshint=true"; } - submit( commit, latestTests, configFile, false, this.async() ); + submit( commit, latestTests, configFile, "", this.async() ); }); grunt.registerTask( "testswarm-multi-jquery", function( commit, configFile, minor ) { -- cgit v1.2.3