Skip to content

Commit

Permalink
Merge branch 'main' into update-morphable-example
Browse files Browse the repository at this point in the history
  • Loading branch information
yhatt committed Feb 18, 2025
2 parents b89c2ad + 9f4e15e commit 4ccff5c
Show file tree
Hide file tree
Showing 11 changed files with 1,189 additions and 1,100 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1

orbs:
browser-tools: circleci/[email protected].0
browser-tools: circleci/[email protected].1
codecov: codecov/[email protected]

executors:
Expand All @@ -12,7 +12,7 @@ executors:
default: false
version:
type: string
default: '22.12.0' # Specify LTS major and minor for development
default: '22.14.0' # Specify LTS major and minor for development
docker:
- image: cimg/node:<< parameters.version >><<# parameters.browser >>-browsers<</ parameters.browser >>
working_directory: ~/marp-cli
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
fail-fast: false
matrix:
node-version:
- '^18.20.5'
- '^20.18.1'
- '22.12.0'
- '^18.20.6'
- '^20.18.3'
- '22.14.0'

steps:
# - name: Output concurrency group
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22.12.0
22.14.0
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### Changed

- Upgrade dependent packages to the latest versions ([#648](https://github.com/marp-team/marp-cli/pull/648))
- Use arm64 hosted runner to build container image for ARM64 ([#635](https://github.com/marp-team/marp-cli/issues/635), [#637](https://github.com/marp-team/marp-cli/pull/637))

### Fixed
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#################### Build Marp CLI ####################
FROM --platform=$BUILDPLATFORM node:22.12.0-bookworm-slim AS build
FROM --platform=$BUILDPLATFORM node:22.14.0-bookworm-slim AS build
WORKDIR /home/node/marp-cli
COPY . .
RUN npm ci && npm run build

#################### Create Marp CLI image ####################
FROM node:22.12.0-bookworm-slim
FROM node:22.14.0-bookworm-slim

# Set up user for Marp CLI
RUN groupadd -r marp && useradd -r -g marp marp && mkdir -p /home/marp/app /home/marp/.cli && chown -R marp:marp /home/marp
Expand Down
Loading

0 comments on commit 4ccff5c

Please sign in to comment.