Revert "🏗 Update @percy/percy-puppeteer to v1.x (ampproject#25176)" (a…

…mpproject#25213) This reverts commit 7a0a66f.
Parsely · Oct 23, 2019 · 5059332 · 5059332
1 parent 1f1cf2f
commit 5059332
Show file tree

Hide file tree

Showing 8 changed files with 1,222 additions and 1,151 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,8 @@ test/coverage
 *.swp
 *.swo
 yarn-error.log
+PERCY_BUILD_ID
+chromedriver.log
 sc-*-linux*
 sc-*-osx*
 sauce_connect_*

diff --git a/build-system/common/exec.js b/build-system/common/exec.js
@@ -21,7 +21,8 @@
 
 const childProcess = require('child_process');
 
-const shellCmd = process.platform == 'win32' ? 'cmd' : '/bin/bash';
+const shellCmd = process.platform == 'win32' ? 'cmd' : '/bin/sh';
+const shellFlag = process.platform == 'win32' ? '/C' : '-c';
 
 /**
  * Spawns the given command in a child process with the given options.
@@ -31,7 +32,7 @@ const shellCmd = process.platform == 'win32' ? 'cmd' : '/bin/bash';
  * @return {!Object}
  */
 function spawnProcess(cmd, options) {
-  return childProcess.spawnSync(cmd, Object.assign({shell: shellCmd}, options));
+  return childProcess.spawnSync(shellCmd, [shellFlag, cmd], options);
 }
 
 /**
@@ -55,7 +56,7 @@ function exec(cmd, options) {
  * @return {!Object}
  */
 function execScriptAsync(script, options) {
-  return childProcess.spawn(script, Object.assign({shell: shellCmd}, options));
+  return childProcess.spawn(shellCmd, [shellFlag, script], options);
 }
 
 /**

diff --git a/build-system/tasks/visual-diff/helpers.js b/build-system/tasks/visual-diff/helpers.js
@@ -15,10 +15,10 @@
  */
 'use strict';
 
-const argv = require('minimist')(process.argv.slice(2));
 const colors = require('ansi-colors');
 const fancyLog = require('fancy-log');
 const sleep = require('sleep-promise');
+const {isTravisBuild} = require('../../common/travis');
 
 const CSS_SELECTOR_RETRY_MS = 200;
 const CSS_SELECTOR_RETRY_ATTEMPTS = 50;
@@ -54,9 +54,10 @@ function escapeHtml(html) {
 function log(mode, ...messages) {
   switch (mode) {
     case 'verbose':
-      if (argv.verbose) {
-        fancyLog.info(colors.green('VERBOSE:'), ...messages);
+      if (isTravisBuild()) {
+        return;
       }
+      fancyLog.info(colors.green('VERBOSE:'), ...messages);
       break;
     case 'info':
       fancyLog.info(colors.green('INFO:'), ...messages);
@@ -71,6 +72,11 @@ function log(mode, ...messages) {
       process.exitCode = 1;
       fancyLog.error(colors.red('FATAL:'), ...messages);
       throw new Error(messages.join(' '));
+    case 'travis':
+      if (isTravisBuild()) {
+        messages.forEach(message => process.stdout.write(message));
+      }
+      break;
   }
 }