chore: fix travis build of next/rc/release-patch versions

Currently the Travis build of `next`, `rc` and `release-patch` versions takes way too long as the packaging and execution of unit tests is done twice - first time from `grunt pack` execution inside the script and the second time from the npm deploy provider.
To fix this introduce new Grunt task - `travisPack` - it checks if `--travisBranch=<branch name>` is passed and in case it is one of the branches from which we'll release the package, the grunt pack task is skipped. Pass the `--travisBranch` option only to `grunt pack` command in the `.travis.yml` script section, so it will be skipped, but the one from npm deploy step will still be executed.

Also delete some unused and not needed logic.

Author: rosen-vladimirov

.gitignore

@@ -6,7 +6,7 @@
 !vendor/*.js
 !resources/**
 *.js.map
-
+!.travis/**/*
 coverage
 lib-cov
 *.seed

.npmignore

@@ -30,3 +30,5 @@ scratch/
 .travis.yml
 docs/html/
 dev/
+
+.travis/**/*

.travis.yml

@@ -19,14 +19,8 @@ before_script:
 - gem install xcodeproj
 - gem install cocoapods
 - npm install grunt
-- node_modules/.bin/grunt enableScripts:false
-- grunt rebuild
-- "./bin/nativescript error-reporting disable"
-- "./bin/nativescript usage-reporting disable"
-- npm test
-- node_modules/.bin/grunt enableScripts:true
 script:
-- node_modules/.bin/grunt lint && node_modules/.bin/grunt pack --no-color
+- node_modules/.bin/grunt lint && node_modules/.bin/grunt travisPack --travisBranch=$TRAVIS_PULL_REQUEST_BRANCH --no-color
 before_deploy:
 - node .travis/add-publishConfig.js $TRAVIS_BRANCH
 deploy:

.travis/add-publishConfig.js

@@ -16,19 +16,13 @@ if (!branch) {
 	process.exit(1);
 }
 
-switch (branch) {
-	case "release":
-		packageDef.publishConfig.tag = "rc";
-		break;
-	case "release-patch":
-		packageDef.publishConfig.tag = "patch";
-		break;
-	case "master":
-		packageDef.publishConfig.tag = "next";
-		break;
-	default:
-		throw new Error(`Unable to publish as the branch ${branch} does not have corresponding tag. Supported branches are master (next tag), release (rc tag) and release-patch (patch tag)`);
+const releaseBranches = require("./travis-release-branches").releaseBranches;
+const tag = releaseBranches[branch];
+if (!tag) {
+	throw new Error(`Unable to publish as the branch ${branch} does not have corresponding tag. Supported branches are ${JSON.stringify(releaseBranches, null, 2)}`);
 }
 
+packageDef.publishConfig.tag = tag;
+
 const newContent = JSON.stringify(packageDef, null, "  ");
 fsModule.writeFileSync(path, newContent, fileOptions);

.travis/travis-release-branches.js

@@ -0,0 +1,7 @@
+const releaseBranches = {
+    "master": "next",
+    "release": "rc",
+    "release-patch": "patch" 
+};
+
+module.exports.releaseBranches = releaseBranches;

Gruntfile.js

@@ -1,8 +1,7 @@
 const childProcess = require("child_process");
 const EOL = require("os").EOL;
 const now = new Date().toISOString();
-
-const CONFIG_JSON_PATH = "config/config.json";
+const releaseBranches = require("./.travis/travis-release-branches").releaseBranches;
 
 const ENVIRONMENTS = {
 	live: "live",
@@ -143,7 +142,7 @@ module.exports = function (grunt) {
 						"isWindows": true,
 						"isMacOS": true,
 						"isLinux": true,
-						"formatListOfNames": () => {},
+						"formatListOfNames": () => { },
 						"constants": ""
 					}
 				},
@@ -173,50 +172,34 @@ module.exports = function (grunt) {
 
 		var packageJson = grunt.file.readJSON("package.json");
 		var versionParts = packageJson.version.split("-");
-		if (process.env["RELEASE_BUILD"]) {
-			// HACK - excluded until 1.0.0 release or we refactor our project infrastructure (whichever comes first)
-			//			packageJson.version = versionParts[0];
-		} else {
-			versionParts[1] = buildVersion;
-			packageJson.version = versionParts.join("-");
-		}
+		versionParts[1] = buildVersion;
+		packageJson.version = versionParts.join("-");
 		grunt.file.write("package.json", JSON.stringify(packageJson, null, "  "));
 	});
 
 	grunt.registerTask("tslint:build", function (version) {
 		childProcess.execSync("npm run tslint", { stdio: "inherit" });
 	});
 
-	grunt.registerTask("enableScripts", function (enable) {
-		var enableTester = /false/i;
-		var newScriptsAttr = !enableTester.test(enable) ? "scripts" : "skippedScripts";
-		var packageJson = grunt.file.readJSON("package.json");
-		var oldScriptsAttrValue = packageJson.scripts || packageJson.skippedScripts;
-		delete packageJson.scripts;
-		delete packageJson.skippedScripts;
-		packageJson[newScriptsAttr] = oldScriptsAttrValue;
-		grunt.file.write("package.json", JSON.stringify(packageJson, null, "  "));
-	});
-
 	const setConfig = (key, value) => {
 		const configJson = grunt.file.readJSON(CONFIG_DATA.filePath);
 		configJson[key] = value;
 		const stringConfigContent = JSON.stringify(configJson, null, "	") + EOL;
 		grunt.file.write(CONFIG_DATA.filePath, stringConfigContent);
 	}
 
-	grunt.registerTask("set_live_ga_id", function() {
+	grunt.registerTask("set_live_ga_id", function () {
 		setConfig(CONFIG_DATA.gaKey, GA_TRACKING_IDS[ENVIRONMENTS.live]);
 	});
 
-	grunt.registerTask("set_dev_ga_id", function() {
+	grunt.registerTask("set_dev_ga_id", function () {
 		setConfig(CONFIG_DATA.gaKey, GA_TRACKING_IDS[ENVIRONMENTS.dev]);
 	});
 
-	grunt.registerTask("verify_live_ga_id", function() {
+	grunt.registerTask("verify_live_ga_id", function () {
 		var configJson = grunt.file.readJSON(CONFIG_DATA.filePath);
 
-		if(configJson[CONFIG_DATA.gaKey] !== GA_TRACKING_IDS[ENVIRONMENTS.live]) {
+		if (configJson[CONFIG_DATA.gaKey] !== GA_TRACKING_IDS[ENVIRONMENTS.live]) {
 			throw new Error("Google Analytics id is not configured correctly.");
 		}
 	});
@@ -234,6 +217,17 @@ module.exports = function (grunt) {
 		"set_package_version",
 		"shell:build_package"
 	]);
+
+	grunt.registerTask("travisPack", function () {
+		const travisBranch = grunt.option("travisBranch");
+		if (travisBranch && releaseBranches[travisBranch]) {
+			console.log(`Skipping travisPack step as the current branch is ${travisBranch}, so it will be packed from the deploy provider.`);
+			return 0;
+		}
+		
+		return grunt.task.run("pack");
+
+	});
 	grunt.registerTask("lint", ["tslint:build"]);
 	grunt.registerTask("all", ["clean", "test", "lint"]);
 	grunt.registerTask("rebuild", ["clean", "ts:devlib"]);