Merge pull request #4336 from NativeScript/vladimirov/travis-fix

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

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,35 +19,15 @@ 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 --no-color
 before_deploy:
 - node .travis/add-publishConfig.js $TRAVIS_BRANCH
 deploy:
 - provider: npm
   skip_cleanup: true
   email: [email protected]
   on:
-    branch: master
-  api_key:
-    secure: "FM9QLOkFq6JpHlfHkT1i2Ht1ZlttZLq7K3kQNLabw7Z5+BPMcy/f3LRJkAkYMezrKLKRkq1uXmhY0BapoTnR9AVEO/t4g6dtbZ1TZ3xBH/HHnFofTFubOrc7+61DJzKduYtnQ/sn3EEOkN8jrXSY9uas4qZh7PSm1hcfjPI8gdI="
-- provider: npm
-  skip_cleanup: true
-  email: [email protected]
-  on:
-    branch: release
-  api_key:
-    secure: "FM9QLOkFq6JpHlfHkT1i2Ht1ZlttZLq7K3kQNLabw7Z5+BPMcy/f3LRJkAkYMezrKLKRkq1uXmhY0BapoTnR9AVEO/t4g6dtbZ1TZ3xBH/HHnFofTFubOrc7+61DJzKduYtnQ/sn3EEOkN8jrXSY9uas4qZh7PSm1hcfjPI8gdI="
-- provider: npm
-  skip_cleanup: true
-  email: [email protected]
-  on:
-    branch: release-patch
+    all_branches: true
   api_key:
     secure: "FM9QLOkFq6JpHlfHkT1i2Ht1ZlttZLq7K3kQNLabw7Z5+BPMcy/f3LRJkAkYMezrKLKRkq1uXmhY0BapoTnR9AVEO/t4g6dtbZ1TZ3xBH/HHnFofTFubOrc7+61DJzKduYtnQ/sn3EEOkN8jrXSY9uas4qZh7PSm1hcfjPI8gdI="

Gruntfile.js

@@ -2,8 +2,6 @@ const childProcess = require("child_process");
 const EOL = require("os").EOL;
 const now = new Date().toISOString();
 
-const CONFIG_JSON_PATH = "config/config.json";
-
 const ENVIRONMENTS = {
 	live: "live",
 	dev: "dev"
@@ -143,7 +141,7 @@ module.exports = function (grunt) {
 						"isWindows": true,
 						"isMacOS": true,
 						"isLinux": true,
-						"formatListOfNames": () => {},
+						"formatListOfNames": () => { },
 						"constants": ""
 					}
 				},
@@ -166,57 +164,49 @@ module.exports = function (grunt) {
 	grunt.loadNpmTasks("grunt-template");
 
 	grunt.registerTask("set_package_version", function (version) {
+		// NOTE: DO NOT call this task in npm's prepack script - it will change the version in package.json,
+		// but npm will still try to publish the version that was originally specified in the package.json/
+		// Also this may break some Jenkins builds as the produced package will have unexpected name.
 		var buildVersion = version !== undefined ? version : buildNumber;
 		if (process.env["BUILD_CAUSE_GHPRBCAUSE"]) {
 			buildVersion = "PR" + buildVersion;
 		}
 
 		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 {
+
+		// The env is used in Jenkins job to produce package that will be releasd with "latest" tag in npm (i.e. strict version).
+		if (!process.env["RELEASE_BUILD"]) {
 			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 +224,16 @@ module.exports = function (grunt) {
 		"set_package_version",
 		"shell:build_package"
 	]);
+
+	grunt.registerTask("travisPack", function () {
+		if (travis && process.env.TRAVIS_PULL_REQUEST_BRANCH) {
+			return grunt.task.run("pack");
+		}
+		
+		// Set correct version in Travis job, so the deploy will not publish strict version (for example 5.2.0).
+		grunt.task.run("set_package_version");
+		console.log(`Skipping pack step as the current build is not from PR, so it will be packed from the deploy provider.`);
+	});
 	grunt.registerTask("lint", ["tslint:build"]);
 	grunt.registerTask("all", ["clean", "test", "lint"]);
 	grunt.registerTask("rebuild", ["clean", "ts:devlib"]);