Skip to content

Commit

Permalink
Update Node to 12.21.0 (#50381)
Browse files Browse the repository at this point in the history
  • Loading branch information
scinos committed Feb 24, 2021
1 parent e88fb8b commit 1385c7e
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Expand Up @@ -8,7 +8,7 @@ references:
defaults: &defaults
working_directory: ~/wp-calypso
docker:
- image: cimg/node:12.20.1
- image: cimg/node:12.21.0
environment:
CIRCLE_ARTIFACTS: /tmp/artifacts
CIRCLE_TEST_REPORTS: /tmp/test_results
Expand Down Expand Up @@ -820,7 +820,7 @@ jobs:

wp-desktop-linux:
docker:
- image: circleci/node:12.20.1-browsers
- image: circleci/node:12.21.0-browsers
<<: *desktop_defaults
shell: /bin/bash --login
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/editing-toolkit-plugin.yml
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v1
with:
node-version: '^12.20.1'
node-version: '^12.21.0'
- name: Checkout code
uses: actions/checkout@HEAD

Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v1
with:
node-version: '12.20.1'
node-version: '12.21.0'

- name: Checkout code
uses: actions/checkout@HEAD
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/icfy-stats.yml
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v1
with:
node-version: '^12.20.1'
node-version: '^12.21.0'
- name: Checkout code
uses: actions/checkout@v2
- name: Fetch git history
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
@@ -1 +1 @@
12.20.1
12.21.0
2 changes: 1 addition & 1 deletion Dockerfile
@@ -1,5 +1,5 @@
ARG use_cache=false
ARG node_version=12.20.1
ARG node_version=12.21.0

###################
FROM node:${node_version} as builder-cache-false
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.base
@@ -1,7 +1,7 @@
#### cache image
#### This image is not pushed to any repository and it shouldn't be used as base image for any other docker build.
#### Its main goal is to create a `/calypso/.cache` that can be copied over other images that can benefit from a warm cache.
FROM node:12.20.1 as cache
FROM node:12.21.0 as cache

ARG node_memory=8192
WORKDIR /calypso
Expand Down Expand Up @@ -34,7 +34,7 @@ ENTRYPOINT [ "/bin/bash" ]

#### base image
#### This image can be used as a base image for other builds, or to uni test and build calypso.
FROM node:12.20.1 as base
FROM node:12.21.0 as base

ARG node_memory=8192
ARG UID=1003
Expand Down
2 changes: 1 addition & 1 deletion desktop/Dockerfile
@@ -1,6 +1,6 @@
FROM debian:latest

ARG NODE_VERSION=12.20.1
ARG NODE_VERSION=12.21.0

# prepare .ssh dir
RUN mkdir -p /root/.ssh/
Expand Down
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -49,7 +49,7 @@
]
},
"engines": {
"node": "^v12.20.1",
"node": "^v12.21.0",
"yarn": "^1.22.10"
},
"scripts": {
Expand Down Expand Up @@ -317,4 +317,4 @@
"chokidar": "^2.1.8",
"eslint-nibble": "^6.0.0"
}
}
}
2 changes: 1 addition & 1 deletion packages/wp-babel-makepot/Dockerfile
@@ -1,4 +1,4 @@
FROM node:12.20.1
FROM node:12.21.0

# /src is where we expect source javascript to run our babel config over
RUN mkdir /src
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/docs/troubleshooting.md
Expand Up @@ -5,8 +5,8 @@
<!-- TOC -->

- [Troubleshooting & Debugging](#troubleshooting--debugging)
- [Table of contents](#table-of-contents)
- [git pre-commit hook/husky](#git-pre-commit-hookhusky)
- [Table of contents](#table-of-contents)
- [git pre-commit hook/husky](#git-pre-commit-hookhusky)

<!-- /TOC -->

Expand All @@ -15,7 +15,7 @@
If running `git commit` shows the following:

```
husky > pre-commit (node v12.20.1)
husky > pre-commit (node v12.21.0)
error Command "install-if-no-packages" not found.
husky > pre-commit hook failed (add --no-verify to bypass)
```
Expand All @@ -36,4 +36,4 @@ rm -rf node_modules
npm run install-if-no-packages
```

Once complete, running `git commit` should no longer trigger the git pre-commit hook error.
Once complete, running `git commit` should no longer trigger the git pre-commit hook error.

0 comments on commit 1385c7e

Please sign in to comment.