Skip to content

Commit

Permalink
Upgrade development Node.js to v20 LTS
Browse files Browse the repository at this point in the history
  • Loading branch information
yhatt committed Sep 15, 2024
1 parent 37cd008 commit d5ccfc4
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 11 deletions.
23 changes: 19 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ executors:
default: false
version:
type: string
default: '18.18.0' # Specify LTS major and minor for development
default: '20.17.0' # Specify LTS major and minor for development
docker:
- image: cimg/node:<< parameters.version >><<# parameters.browser >>-browsers<</ parameters.browser >>
working_directory: ~/marp-cli
Expand All @@ -36,7 +36,7 @@ commands:
default: []
yarn:
type: string
default: '^1.22.17'
default: '^1.22.22'
steps:
- run:
name: Upgrade yarn for current user
Expand Down Expand Up @@ -185,11 +185,12 @@ jobs:
steps:
- audit

# Testing
test-node16:
executor:
name: node
browser: true
version: '16.18'
version: '16.20'
steps:
- test:
force: true
Expand All @@ -199,6 +200,7 @@ jobs:
executor:
name: node
browser: true
version: '18.20'
steps:
- test:
browser: true
Expand All @@ -207,11 +209,20 @@ jobs:
executor:
name: node
browser: true
version: '20.9'
steps:
- test:
browser: true

test-node22:
executor:
name: node
browser: true
version: '22.8'
steps:
- test:
browser: true

# Docker
docker-build-latest:
executor: node
steps:
Expand Down Expand Up @@ -250,13 +261,17 @@ workflows:
- test-node20:
requires:
- audit
- test-node22:
requires:
- audit

# Docker (latest)
- docker-build-latest:
requires:
- test-node16
- test-node18
- test-node20
- test-node22
filters:
branches:
only: main
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/test-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
# cancel-in-progress: true

env:
YARN_VERSION: '^1.22.19'
YARN_VERSION: '^1.22.22'

jobs:
win-test:
Expand All @@ -19,11 +19,12 @@ jobs:
fail-fast: false
matrix:
node-version:
- '^16.18.1'
- '18.18.0'
- '^20.9.0'
- '^16.20.2'
- '^18.20.4'
- '20.17.0'
- '^22.8.0'
include:
- node-version: '^16.18.1'
- node-version: '^16.20.2'
force: true

steps:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.18.0
20.17.0
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18.17.0-alpine
FROM node:20.17.0-alpine
LABEL maintainer "Marp team"

RUN apk update && apk upgrade && \
Expand Down

0 comments on commit d5ccfc4

Please sign in to comment.