Skip to content
This repository has been archived by the owner on Oct 23, 2023. It is now read-only.

Commit

Permalink
Merge pull request #145 from Financial-Times/nori/upgrade-node
Browse files Browse the repository at this point in the history
Upgrade to Node 14/16
  • Loading branch information
ivomurrell authored Mar 18, 2022
2 parents 0669126 + d121144 commit 0f1f2a0
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 9 deletions.
48 changes: 42 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -141,26 +145,42 @@ 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-v16.14

renovate-nori-build-test:
jobs:
Expand All @@ -171,9 +191,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:
Expand All @@ -184,10 +212,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:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12
16
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"config": {},
"engines": {
"node": "12.x",
"node": "14.x || 16.x",
"npm": "7.x || 8.x"
},
"husky": {
Expand All @@ -43,7 +43,7 @@
}
},
"volta": {
"node": "12.22.5",
"node": "16.14.1",
"npm": "7.20.2"
}
}

0 comments on commit 0f1f2a0

Please sign in to comment.