Use node.js v16.8.0 for CI (#2292)

* Use node.js v16.8.0 for CI * Share docker image
grouparoo · Sep 13, 2021 · 04159c9 · 04159c9
1 parent 0a3d670
commit 04159c9
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 72 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/tools/merger/data/ci/apps/job.yml.template b/tools/merger/data/ci/apps/job.yml.template
@@ -1,6 +1,6 @@
   {{{job_name}}}:
     docker:
-      - image: circleci/node:16
+      - image: {{{docker_image}}}
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD

diff --git a/tools/merger/data/ci/base.yml.template b/tools/merger/data/ci/base.yml.template
@@ -18,7 +18,7 @@ jobs:
   build:
     resource_class: "medium+"
     docker:
-      - image: circleci/node:16
+      - image: {{{docker_image}}}
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
@@ -38,7 +38,7 @@ jobs:
 
   complete:
     docker:
-      - image: circleci/node:16
+      - image: {{{docker_image}}}
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD

diff --git a/tools/merger/data/ci/cli/job.yml.template b/tools/merger/data/ci/cli/job.yml.template
@@ -1,6 +1,6 @@
   {{{job_name}}}:
     docker:
-      - image: circleci/node:16
+      - image: {{{docker_image}}}
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD

diff --git a/tools/merger/data/ci/client/job.yml.template b/tools/merger/data/ci/client/job.yml.template
@@ -1,6 +1,6 @@
   {{{job_name}}}:
     docker:
-      - image: circleci/node:16
+      - image: {{{docker_image}}}
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD

diff --git a/tools/merger/data/ci/command/job.yml.template b/tools/merger/data/ci/command/job.yml.template
@@ -1,6 +1,6 @@
   {{{job_name}}}:
     docker:
-      - image: circleci/node:16
+      - image: {{{docker_image}}}
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD

diff --git a/tools/merger/data/ci/core-local/job.yml.template b/tools/merger/data/ci/core-local/job.yml.template
@@ -1,6 +1,6 @@
   {{{job_name}}}:
     docker:
-      - image: circleci/node:16
+      - image: {{{docker_image}}}
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD

diff --git a/tools/merger/data/ci/core/job.yml.template b/tools/merger/data/ci/core/job.yml.template
@@ -1,6 +1,6 @@
   test-{{{type}}}-{{{test_section}}}:
     docker:
-      - image: circleci/node:16
+      - image: {{{docker_image}}}
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD

diff --git a/tools/merger/data/ci/plugin/job.yml.template b/tools/merger/data/ci/plugin/job.yml.template
@@ -1,6 +1,6 @@
   {{{job_name}}}:
     docker:
-      - image: circleci/node:16
+      - image: {{{docker_image}}}
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD

diff --git a/tools/merger/data/ci/ui/job.yml.template b/tools/merger/data/ci/ui/job.yml.template
@@ -1,6 +1,6 @@
   {{{job_name}}}:
     docker:
-      - image: circleci/node:16
+      - image: {{{docker_image}}}
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD

diff --git a/tools/merger/src/ci_generate.js b/tools/merger/src/ci_generate.js
@@ -5,6 +5,8 @@ const Mustache = require("mustache");
 const { allPackagePaths, allPluginPaths } = require("../../shared/packages");
 const execSync = require("../../shared/exec");
 
+const docker_image = "circleci/node:16.8.0";
+
 module.exports.cmd = async function (vargs) {
   const instance = new Generator(vargs);
   await instance.generate();
@@ -367,6 +369,7 @@ class Generator {
 
   renderJob(job, name) {
     const template = readTemplate(name, job.type);
+    job.docker_image = docker_image;
     return Mustache.render(template, job);
   }
 
@@ -394,6 +397,7 @@ class Generator {
     // these get passed through
     view[".Branch"] = "{{ .Branch }}";
     view[".Revision"] = "{{ .Revision }}";
+    view.docker_image = docker_image;
 
     const methods = [
       "jobs",