Merge branch 'master' into FixOrganizeImports

Author: andrewbranch

.travis.yml

@@ -5,7 +5,6 @@ const log = require("fancy-log");
 const newer = require("gulp-newer");
 const sourcemaps = require("gulp-sourcemaps");
 const del = require("del");
-const fold = require("travis-fold");
 const rename = require("gulp-rename");
 const concat = require("gulp-concat");
 const merge2 = require("merge2");
@@ -346,9 +345,6 @@ const runEslintRulesTests = () => runConsoleTests("scripts/eslint/built/tests",
 task("run-eslint-rules-tests", series(buildEslintRules, runEslintRulesTests));
 task("run-eslint-rules-tests").description = "Runs the eslint rule tests";
 
-const lintFoldStart = async () => { if (fold.isTravis()) console.log(fold.start("lint")); };
-const lintFoldEnd = async () => { if (fold.isTravis()) console.log(fold.end("lint")); };
-
 /** @type { (folder: string) => { (): Promise<any>; displayName?: string } } */
 const eslint = (folder) => async () => {
 
@@ -374,20 +370,20 @@ const eslint = (folder) => async () => {
 
 const lintScripts = eslint("scripts");
 lintScripts.displayName = "lint-scripts";
-task("lint-scripts", series([buildEslintRules, lintFoldStart, lintScripts, lintFoldEnd]));
+task("lint-scripts", series([buildEslintRules, lintScripts]));
 task("lint-scripts").description = "Runs eslint on the scripts sources.";
 
 const lintCompiler = eslint("src");
 lintCompiler.displayName = "lint-compiler";
-task("lint-compiler", series([buildEslintRules, lintFoldStart, lintCompiler, lintFoldEnd]));
+task("lint-compiler", series([buildEslintRules, lintCompiler]));
 task("lint-compiler").description = "Runs eslint on the compiler sources.";
 task("lint-compiler").flags = {
     "   --ci": "Runs eslint additional rules",
 };
 
-const lint = series([buildEslintRules, lintFoldStart, lintScripts, lintCompiler, lintFoldEnd]);
+const lint = series([buildEslintRules, lintScripts, lintCompiler]);
 lint.displayName = "lint";
-task("lint", series([buildEslintRules, lintFoldStart, lint, lintFoldEnd]));
+task("lint", series([buildEslintRules, lint]));
 task("lint").description = "Runs eslint on the compiler and scripts sources.";
 task("lint").flags = {
     "   --ci": "Runs eslint additional rules",
@@ -429,9 +425,7 @@ const buildOtherOutputs = parallel(buildCancellationToken, buildTypingsInstaller
 task("other-outputs", series(preBuild, buildOtherOutputs));
 task("other-outputs").description = "Builds miscelaneous scripts and documents distributed with the LKG";
 
-const buildFoldStart = async () => { if (fold.isTravis()) console.log(fold.start("build")); };
-const buildFoldEnd = async () => { if (fold.isTravis()) console.log(fold.end("build")); };
-task("local", series(buildFoldStart, preBuild, parallel(localize, buildTsc, buildServer, buildServices, buildLssl, buildOtherOutputs), buildFoldEnd));
+task("local", series(preBuild, parallel(localize, buildTsc, buildServer, buildServices, buildLssl, buildOtherOutputs)));
 task("local").description = "Builds the full compiler and services";
 task("local").flags = {
     "   --built": "Compile using the built version of the compiler."

Gulpfile.js

@@ -1,7 +1,7 @@
 
 # TypeScript
 
-[![Build Status](https://travis-ci.org/microsoft/TypeScript.svg?branch=master)](https://travis-ci.org/microsoft/TypeScript)
+[![GitHub Actions CI](https://github.com/microsoft/TypeScript/workflows/CI/badge.svg)](https://github.com/microsoft/TypeScript/actions?query=workflow%3ACI)
 [![Devops Build Status](https://dev.azure.com/typescript/TypeScript/_apis/build/status/Typescript/node10)](https://dev.azure.com/typescript/TypeScript/_build?definitionId=7)
 [![npm version](https://badge.fury.io/js/typescript.svg)](https://www.npmjs.com/package/typescript)
 [![Downloads](https://img.shields.io/npm/dm/typescript.svg)](https://www.npmjs.com/package/typescript)