[CI] Clean up deployment. Build tags.

.travis.yml

@@ -210,12 +210,6 @@ script:
   - haxe RunCi.hxml
   - popd
 
-branches:
-  except:
-    # A hack to prevent building for tags, assuming they all start with a number.
-    # https://github.com/travis-ci/travis-ci/issues/1532
-    - /^[0-9]/
-
 notifications:
   webhooks:
     urls:

Makefile

@@ -238,9 +238,15 @@ xmldoc:
 	haxelib path hxcs   || haxelib git hxcs   https://github.com/HaxeFoundation/hxcs
 	cd extra && haxe doc.hxml
 
+$(INSTALLER_TMP_DIR):
+	mkdir -p $(INSTALLER_TMP_DIR)
+
+$(INSTALLER_TMP_DIR)/neko-osx64.tar.gz: $(INSTALLER_TMP_DIR)
+	wget http://nekovm.org/media/neko-2.1.0-osx64.tar.gz -O installer/neko-osx64.tar.gz
+
 # Installer
 
-package_installer_mac:
+package_installer_mac: $(INSTALLER_TMP_DIR)/neko-osx64.tar.gz package_unix
 	$(eval OUTFILE := $(shell pwd)/$(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_installer.tar.gz)
 	$(eval PACKFILE := $(shell pwd)/$(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_bin.tar.gz)
 	$(eval VERSION := $(shell haxe -version 2>&1))

Makefile.win

@@ -61,7 +61,10 @@ package_choco:
 	mv out/choco/haxe.*.nupkg out
 	rm -rf out/choco
 
-package_installer_win:
+$(INSTALLER_TMP_DIR)/neko-win.zip: $(INSTALLER_TMP_DIR)
+	wget http://nekovm.org/media/neko-2.1.0-win.zip -O installer/neko-win.zip
+
+package_installer_win: $(INSTALLER_TMP_DIR)/neko-win.zip package_win
 	$(eval OUTFILE := $(PACKAGE_OUT_DIR)/$(PACKAGE_FILE_NAME)_installer.zip)
 	$(eval VERSION := $(shell haxe -version 2>&1 | cut -d ' ' -f1))
 	rm -rf $(INSTALLER_TMP_DIR)/resources

appveyor.yml

@@ -22,8 +22,6 @@ environment:
           TEST: "macro"
           DEPLOY_NIGHTLIES: 1
 
-skip_tags: true
-
 cache:
     - opam.tar.xz -> appveyor.yml
 

tests/runci/Deployment.hx

@@ -5,7 +5,6 @@ import runci.System.*;
 import sys.io.File;
 import sys.FileSystem;
 import haxe.*;
-import haxe.io.*;
 using StringTools;
 
 class Deployment {
@@ -44,8 +43,10 @@ class Deployment {
 		}
 	}
 
-	static function isDeployNightlies () {
-		return Sys.getEnv("DEPLOY_NIGHTLIES") != null;
+	static function isDeployNightlies() {
+		return
+			Sys.getEnv("DEPLOY_NIGHTLIES") != null &&
+			(gitInfo.branch == "development" || gitInfo.branch == "master");
 	}
 
 	static function deployBintray():Void {
@@ -77,20 +78,18 @@ class Deployment {
 		}
 	}
 
-	static function shouldDeployInstaller() {
-		if (systemName == 'Linux') {
-			return false;
-		}
-		if (gitInfo.branch == 'nightly-travis') {
-			return true;
-		}
-		var rev = Sys.getEnv('ADD_REVISION');
-		return rev != null && rev != "0";
-	}
-
-	static function isDeployApiDocsRequired () {
-		return gitInfo.branch == "development" &&
-			Sys.getEnv("DEPLOY_API_DOCS") != null;
+	static function isDeployApiDocsRequired() {
+		return
+			Sys.getEnv("DEPLOY_API_DOCS") != null &&
+			(
+				gitInfo.branch == "development" ||
+				switch(Sys.getEnv("TRAVIS_TAG")) {
+					case null, _.trim() => "":
+						false;
+					case tag:
+						true;
+				}
+			);
 	}
 
 	/**
@@ -99,6 +98,7 @@ class Deployment {
 
 	static function deployApiDoc():Void {
 		changeDirectory(repoDir);
+		runCommand("make", ["xmldoc"]);
 		File.saveContent("extra/doc/info.json", Json.stringify({
 			"commit": gitInfo.commit,
 			"branch": gitInfo.branch,
@@ -116,93 +116,66 @@ class Deployment {
 	/**
 		Deploy source package to hxbuilds s3
 	*/
-	static function deployNightlies(doInstaller:Bool):Void {
-		var gitTime = commandResult("git", ["show", "-s", "--format=%ct", "HEAD"]).stdout;
-		var tzd = {
-			var z = Date.fromTime(0);
-			z.getHours() * 60 * 60 * 1000 + z.getMinutes() * 60 * 1000;
-		};
-		var time = Date.fromTime(Std.parseFloat(gitTime) * 1000 - tzd);
-		if (
-			(gitInfo.branch == "development" ||
-			gitInfo.branch == "master" ||
-			gitInfo.branch == "nightly-travis") &&
-			Sys.getEnv("HXBUILDS_AWS_ACCESS_KEY_ID") != null &&
-			Sys.getEnv("HXBUILDS_AWS_SECRET_ACCESS_KEY") != null &&
-			Sys.getEnv("TRAVIS_PULL_REQUEST") != "true"
-		) {
-			switch (ci) {
-				case null:
-					trace('Not deploying nightlies (not in CI)');
-				case TravisCI:
-					runCommand("make", ["-s", "package_unix"]);
-					if (doInstaller) {
-						getLatestNeko();
-						runCommand("make", ["-s", 'package_installer_mac']);
+	static function deployNightlies():Void {
+		changeDirectory(repoDir);
+
+		switch (systemName) {
+			case "Linux":
+				runCommand("make", ["-s", "package_unix"]);// source
+				for (file in sys.FileSystem.readDirectory('out')) {
+					if (file.startsWith('haxe') && file.endsWith('_src.tar.gz')) {
+						submitToS3("source", 'out/$file');
+						break;
 					}
-					if (systemName == 'Linux') {
-						// source
-						for (file in sys.FileSystem.readDirectory('out')) {
-							if (file.startsWith('haxe') && file.endsWith('_src.tar.gz')) {
-								submitToS3("source", 'out/$file');
-								break;
-							}
+				}
+				for (file in sys.FileSystem.readDirectory('out')) {
+					if (file.startsWith('haxe')) {
+						if (file.endsWith('_bin.tar.gz')) {
+							submitToS3('linux64', 'out/$file');
 						}
 					}
-					for (file in sys.FileSystem.readDirectory('out')) {
-						if (file.startsWith('haxe')) {
-							if (file.endsWith('_bin.tar.gz')) {
-								var name = systemName == "Linux" ? 'linux64' : 'mac';
-								submitToS3(name, 'out/$file');
-							} else if (file.endsWith('_installer.tar.gz')) {
-								submitToS3('mac-installer', 'out/$file');
-							}
+				}
+			case "Mac":
+				runCommand("make", ["-s", 'package_unix', 'package_installer_mac']);
+				for (file in sys.FileSystem.readDirectory('out')) {
+					if (file.startsWith('haxe')) {
+						if (file.endsWith('_bin.tar.gz')) {
+							submitToS3('mac', 'out/$file');
+						} else if (file.endsWith('_installer.tar.gz')) {
+							submitToS3('mac-installer', 'out/$file');
 						}
 					}
-				case AppVeyor:
-					var kind = switch (Sys.getEnv("ARCH")) {
-						case null:
-							throw "ARCH is not set";
-						case "32":
-							"windows";
-						case "64":
-							"windows64";
-						case _:
-							throw "unknown ARCH";
-					}
+				}
+			case "Windows":
+				var kind = switch (Sys.getEnv("ARCH")) {
+					case null:
+						throw "ARCH is not set";
+					case "32":
+						"windows";
+					case "64":
+						"windows64";
+					case _:
+						throw "unknown ARCH";
+				}
 
-					if (doInstaller) {
-						getLatestNeko();
-						var cygRoot = Sys.getEnv("CYG_ROOT");
-						if (cygRoot != null) {
-							runCommand('$cygRoot/bin/bash', ['-lc', "cd \"$OLDPWD\" && make -s -f Makefile.win package_installer_win"]);
-						} else {
-							runCommand("make", ['-f', 'Makefile.win', "-s", 'package_installer_win']);
-						}
-					}
-					for (file in sys.FileSystem.readDirectory('out')) {
-						if (file.startsWith('haxe')) {
-							if (file.endsWith('_bin.zip')) {
-								submitToS3(kind, 'out/$file');
-							} else if (file.endsWith('_installer.zip')) {
-								submitToS3('${kind}-installer', 'out/$file');
-							}
+				var cygRoot = Sys.getEnv("CYG_ROOT");
+				if (cygRoot != null) {
+					runCommand('$cygRoot/bin/bash', ['-lc', "cd \"$OLDPWD\" && make -s -f Makefile.win package_installer_win"]);
+				} else {
+					runCommand("make", ['-f', 'Makefile.win', "-s", 'package_installer_win']);
+				}
+				for (file in sys.FileSystem.readDirectory('out')) {
+					if (file.startsWith('haxe')) {
+						if (file.endsWith('_bin.zip')) {
+							submitToS3(kind, 'out/$file');
+						} else if (file.endsWith('_installer.zip')) {
+							submitToS3('${kind}-installer', 'out/$file');
 						}
 					}
-			}
-		} else {
-			trace('Not deploying nightlies');
-		}
-	}
-
-	static function getLatestNeko() {
-		if (!FileSystem.exists('installer')) {
-			FileSystem.createDirectory('installer');
+				}
+			case _:
+				throw "unknown system";
 		}
-		var src = 'http://nekovm.org/media/neko-2.1.0-';
-		var suffix = systemName == 'Windows' ? 'win.zip' : 'osx64.tar.gz';
-		src += suffix;
-		runCommand("wget", [src, '-O', 'installer/neko-$suffix'], true);
 	}
 
 	static function fileExtension(file:String) {
@@ -216,29 +189,30 @@ class Deployment {
 	}
 
 	static function submitToS3(kind:String, sourceFile:String) {
-		var date = DateTools.format(Date.now(), '%Y-%m-%d');
-		var ext = fileExtension(sourceFile);
-		var fileName = 'haxe_${date}_${gitInfo.branch}_${gitInfo.commit.substr(0,7)}${ext}';
-
-		var changeLatest = gitInfo.branch == "development";
-		Sys.putEnv('AWS_ACCESS_KEY_ID', Sys.getEnv('HXBUILDS_AWS_ACCESS_KEY_ID'));
-		Sys.putEnv('AWS_SECRET_ACCESS_KEY', Sys.getEnv('HXBUILDS_AWS_SECRET_ACCESS_KEY'));
-		runCommand('aws s3 cp --region us-east-1 "$sourceFile" "$S3_HXBUILDS_ADDR/$kind/$fileName"');
-		if (changeLatest) {
-			runCommand('aws s3 cp --region us-east-1 "$sourceFile" "$S3_HXBUILDS_ADDR/$kind/haxe_latest$ext"');
-		}
-		Indexer.index('$S3_HXBUILDS_ADDR/$kind/');
-		runCommand('aws s3 cp --region us-east-1 index.html "$S3_HXBUILDS_ADDR/$kind/index.html"');
+		switch ([
+			Sys.getEnv("HXBUILDS_AWS_ACCESS_KEY_ID"),
+			Sys.getEnv("HXBUILDS_AWS_SECRET_ACCESS_KEY")
+		]) {
+			case [null, _] | [_, null]:
+				infoMsg("Missing HXBUILDS_AWS_*, skip submit to S3");
+			case [accessKeyId, secretAccessKey]:
+				var date = DateTools.format(Date.now(), '%Y-%m-%d');
+				var ext = fileExtension(sourceFile);
+				var fileName = 'haxe_${date}_${gitInfo.branch}_${gitInfo.commit.substr(0,7)}${ext}';
 
-		Indexer.index('$S3_HXBUILDS_ADDR/');
-		runCommand('aws s3 cp --region us-east-1 index.html "$S3_HXBUILDS_ADDR/index.html"');
-	}
+				var changeLatest = gitInfo.branch == "development";
+				Sys.putEnv('AWS_ACCESS_KEY_ID', accessKeyId);
+				Sys.putEnv('AWS_SECRET_ACCESS_KEY', secretAccessKey);
+				runCommand('aws s3 cp --region us-east-1 "$sourceFile" "$S3_HXBUILDS_ADDR/$kind/$fileName"');
+				if (changeLatest) {
+					runCommand('aws s3 cp --region us-east-1 "$sourceFile" "$S3_HXBUILDS_ADDR/$kind/haxe_latest$ext"');
+				}
+				Indexer.index('$S3_HXBUILDS_ADDR/$kind/');
+				runCommand('aws s3 cp --region us-east-1 index.html "$S3_HXBUILDS_ADDR/$kind/index.html"');
 
-	static function createNsiInstaller() {
-		if (!FileSystem.exists('installer')) {
-			FileSystem.createDirectory('installer');
+				Indexer.index('$S3_HXBUILDS_ADDR/');
+				runCommand('aws s3 cp --region us-east-1 index.html "$S3_HXBUILDS_ADDR/index.html"');
 		}
-		getLatestNeko();
 	}
 
 	/**
@@ -309,26 +283,16 @@ class Deployment {
 	}
 
 	static public function deploy():Void {
-		var doDocs = isDeployApiDocsRequired();
-		var doNightlies = isDeployNightlies();
-		var doInstaller = doNightlies && shouldDeployInstaller();
+		if (isDeployApiDocsRequired()) {
+			deployApiDoc();
+		} else {
+			infoMsg("Not deploying API doc");
+		}
 
-		if (doDocs || doNightlies) {
-			changeDirectory(repoDir);
-			if (doDocs) {
-				if (systemName != 'Windows') {
-					// generate doc
-					runCommand("make", ["xmldoc"]);
-					// deployBintray();
-					deployApiDoc();
-					// disable deployment to ppa:haxe/snapshots for now
-					// because there is no debian sedlex package...
-					// deployPPA();
-				}
-			}
-			if (doNightlies) {
-				deployNightlies(doInstaller);
-			}
+		if (isDeployNightlies()) {
+			deployNightlies();
+		} else {
+			infoMsg("Not deploying nightlies");
 		}
 	}
 }