Skip to content

Commit ca97606

Browse files
committed
Merge branch 'change/update-ci-config' into release/2.3.0
# Conflicts: # .npmignore # README.md
2 parents cfe0237 + 0158e36 commit ca97606

File tree

6 files changed

+11
-27
lines changed

6 files changed

+11
-27
lines changed

.circleci/config.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
version: 2.1
2+
jobs:
3+
build:
4+
docker:
5+
- image: cimg/node:18.10
6+
steps:
7+
- checkout
8+
- run: yarn install
9+
- run: yarn run build

.npmignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
/src/
66
/.eslintrc.json
77
/.gitignore
8-
/.travis.yml
98
/.yalcignore
109
/circle.yml
1110
/yarn.lock

.travis.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
- Use yalc to build and test our library in `/dev_app/`
99
- Rewrite the testing page in typescript and with functional components
1010
- Remove unmaintained dependency `react-hotkeys`
11+
- Update CircleCI config
1112

1213
## Fix
1314
- Rewrite a large portion of the README for clarity and fixing some mistakes

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
React Editable Json Tree
22
========================
3-
[![Build Status](https://travis-ci.org/oxyno-zeta/react-editable-json-tree.svg?branch=master)](https://travis-ci.org/oxyno-zeta/react-editable-json-tree) [![Build Status](https://circleci.com/gh/oxyno-zeta/react-editable-json-tree.png)](https://circleci.com/gh/oxyno-zeta/react-editable-json-tree) [![npm](https://img.shields.io/npm/v/react-editable-json-tree.svg)]() [![Node version](https://img.shields.io/node/v/react-editable-json-tree)](https://nodejs.org) [![React version](https://img.shields.io/npm/dependency-version/react-editable-json-tree/peer/react)](https://reactjs.org/)
3+
[![Build Status](https://circleci.com/gh/oxyno-zeta/react-editable-json-tree.png)](https://circleci.com/gh/oxyno-zeta/react-editable-json-tree) [![npm](https://img.shields.io/npm/v/react-editable-json-tree.svg)]() [![Node version](https://img.shields.io/node/v/react-editable-json-tree)](https://nodejs.org) [![React version](https://img.shields.io/npm/dependency-version/react-editable-json-tree/peer/react)](https://reactjs.org/)
44

55
## ⚠ Security advisory
66

circle.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)