From 768578f1f41f41452925e6e06edd20f01e503103 Mon Sep 17 00:00:00 2001 From: Ivo Murrell Date: Tue, 1 Mar 2022 16:28:01 +0000 Subject: [PATCH] Update to node 16 and test node 14 in the CI --- .circleci/config.yml | 52 +++++++++++++++++++++++++++++++++++++++----- package.json | 4 ++-- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1479b6f..509893f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,11 @@ references: &container_config_node working_directory: ~/project/build docker: - - image: cimg/node:12.22 + - image: cimg/node:<< parameters.node-version >> + parameters: + node-version: + default: "16.14" + type: string workspace_root: &workspace_root ~/project @@ -138,26 +142,46 @@ workflows: - build: filters: <<: *filters_ignore_tags_renovate_nori + name: build-v<< matrix.node-version >> + matrix: + parameters: + node-version: [ "16.14", "14.19" ] - test: requires: - - build + - build-v<< matrix.node-version >> + name: test-v<< matrix.node-version >> + matrix: + parameters: + node-version: [ "16.14", "14.19" ] build-test-publish: jobs: - build: filters: <<: *filters_version_tag + name: build-v<< matrix.node-version >> + matrix: + parameters: + node-version: [ "16.14", "14.19" ] - test: filters: <<: *filters_version_tag requires: - - build + - build-v<< matrix.node-version >> + name: test-v<< matrix.node-version >> + matrix: + parameters: + node-version: [ "16.14", "14.19" ] - publish: context: npm-publish-token filters: <<: *filters_version_tag requires: - - test + - test-v<< matrix.node-version >> + name: publish-v<< matrix.node-version >> + matrix: + parameters: + node-version: [ "16.14", "14.19" ] renovate-nori-build-test: jobs: @@ -168,9 +192,17 @@ workflows: - build: requires: - waiting-for-approval + name: build-v<< matrix.node-version >> + matrix: + parameters: + node-version: [ "16.14", "14.19" ] - test: requires: - - build + - build-v<< matrix.node-version >> + name: test-v<< matrix.node-version >> + matrix: + parameters: + node-version: [ "16.14", "14.19" ] nightly: triggers: @@ -181,10 +213,18 @@ workflows: jobs: - build: context: next-nightly-build + name: build-v<< matrix.node-version >> + matrix: + parameters: + node-version: [ "16.14", "14.19" ] - test: requires: - - build + - build-v<< matrix.node-version >> context: next-nightly-build + name: test-v<< matrix.node-version >> + matrix: + parameters: + node-version: [ "16.14", "14.19" ] notify: webhooks: diff --git a/package.json b/package.json index 3685153..6a5500d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@financial-times/n-heroku-tools", "version": "0.0.0", "engines": { - "node": "12.x", + "node": "14.x || 16.x", "npm": "7.x || 8.x" }, "bin": { @@ -53,7 +53,7 @@ } }, "volta": { - "node": "12.22.5", + "node": "16.14.0", "npm": "7.20.2" } }