apply recommendations to use parameters in config

ampproject · Feb 25, 2021 · 9bf1029 · 9bf1029
1 parent 1ee93ce
commit 9bf1029
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 21 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -139,26 +139,21 @@ jobs:
           name: 'Validator Tests'
           command: node build-system/pr-check/validator-tests.js
       - fail_fast
-  'Nomodule Visual Diff Tests':
+  'Visual Diff Tests':
     executor:
       name: amphtml-large-executor
     steps:
       - setup_vm
       - install_chrome
       - run:
-          name: 'Nomodule Visual Diff Tests'
-          command: node build-system/pr-check/visual-diff-tests.js
-      - fail_fast
-  'Module Visual Diff Tests':
-    executor:
-      name: amphtml-large-executor
-    steps:
-      - setup_vm
-      - install_chrome
-      - run:
-          name: 'Module Visual Diff Tests'
-          command: node build-system/pr-check/visual-diff-tests.js --esm
+          name: 'Visual Diff Tests (using << parameters.build_type >> build)'
+          command: node build-system/pr-check/visual-diff-tests.js --type << parameters.build_type >>
       - fail_fast
+    parameters:
+      build_type:
+        description: 'Which build type to use'
+        type: string
+        enum: ['module', 'nomodule']
   'Unit Tests':
     executor:
       name: amphtml-large-executor
@@ -323,14 +318,14 @@ workflows:
             - 'Module Build'
       - 'Validator Tests':
           <<: *push_and_pr_builds
-      - 'Nomodule Visual Diff Tests':
+      - 'Visual Diff Tests':
+          name: 'Visual Diff Tests (<< matrix.build_type >>)'
+          matrix:
+            parameters:
+              build_type: ['module', 'nomodule']
           <<: *push_and_pr_builds
           requires:
             - 'Nomodule Build'
-      - 'Module Visual Diff Tests':
-          <<: *push_and_pr_builds
-          requires:
-            - 'Module Build'
       - 'Unit Tests':
           <<: *push_and_pr_builds
       - 'Unminified Tests':

diff --git a/build-system/pr-check/visual-diff-tests.js b/build-system/pr-check/visual-diff-tests.js
@@ -31,7 +31,7 @@ const {runCiJob} = require('./ci-job');
 
 const jobName = 'visual-diff-tests.js';
 
-const esmFlag = argv.esm ? ' --esm' : '';
+const esmFlag = argv.type === 'module' ? ' --esm' : '';
 
 function pushBuildWorkflow() {
   downloadNomoduleOutput();

diff --git a/build-system/tasks/serve.js b/build-system/tasks/serve.js
@@ -206,7 +206,7 @@ async function restartServer(serverOptions = {}) {
     }
   }
   resetServerFiles();
-  startServer({}, connectOptions);
+  startServer({}, serverOptions);
 }
 
 /**

diff --git a/build-system/tasks/visual-diff/index.js b/build-system/tasks/visual-diff/index.js
@@ -184,8 +184,9 @@ async function launchPercyAgent() {
 async function launchWebServer() {
   await startServer(
     {host: HOST, port: PORT},
+    // eslint-disable-next-line google-camelcase/google-camelcase
     {quiet: !argv.webserver_debug, new_server: argv.esm},
-    {compiled: true, esm: argv.esm},
+    {compiled: true, esm: argv.esm}
   );
 }