Skip to content

Commit 2dc08de

Browse files
authored
Merge branch 'main' into yaml-defaults
2 parents 2033e52 + 043a31d commit 2dc08de

11 files changed

Lines changed: 5054 additions & 13831 deletions

File tree

.circleci/config.yml

Lines changed: 0 additions & 48 deletions
This file was deleted.
Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,55 @@
1-
name: Semantic Release
2-
on:
3-
push:
4-
branches:
5-
- 'main'
1+
name: Build
2+
on: [push]
3+
4+
env:
5+
CI_BUILD_NUM: ${{ github.run_id }}
6+
CI_BRANCH: ${{ github.ref_name }}
7+
CIRCLE_REPOSITORY_URL: dummy-url
68

79
jobs:
810
build:
11+
name: Test
912
runs-on: ubuntu-latest
10-
if: "!contains(github.event.head_commit.message, '[skip ci]')"
1113
steps:
12-
- uses: actions/checkout@v3
13-
- name: Use Node.js 14.x
14-
uses: actions/setup-node@v3
14+
- uses: actions/checkout@v4
15+
- name: Use Node.js 20.x
16+
uses: actions/setup-node@v4
1517
with:
16-
node-version: '14.x'
18+
node-version: '20.x'
1719
- run: npm install
1820
- run: git config --global user.email "test@project-helix.io" && git config --global user.name "Test Build"
1921
- run: npm test
20-
env:
21-
CIRCLE_REPOSITORY_URL: dummy-url
22+
- uses: codecov/codecov-action@v4
23+
with:
24+
token: ${{ secrets.CODECOV_TOKEN }}
2225

2326
build_win:
27+
name: Test (Windows)
2428
runs-on: windows-latest
25-
if: "!contains(github.event.head_commit.message, '[skip ci]')"
2629
steps:
2730
- run: git config --global core.autocrlf false
28-
- uses: actions/checkout@v3
29-
- name: Use Node.js 14.x
30-
uses: actions/setup-node@v3
31+
- uses: actions/checkout@v4
32+
- name: Use Node.js 20.x
33+
uses: actions/setup-node@v4
3134
with:
32-
node-version: '14.x'
35+
node-version: '20.x'
3336
- run: npm install
3437
- run: git config --global user.email "test@project-helix.io" && git config --global user.name "Test Build"
3538
- run: npm test
36-
env:
37-
CIRCLE_REPOSITORY_URL: dummy-url
3839

3940
release:
41+
name: Release
4042
runs-on: ubuntu-latest
43+
if: github.ref == 'refs/heads/main'
4144
needs: [build, build_win]
42-
if: "!contains(github.event.head_commit.message, '[skip ci]')"
4345
steps:
44-
- uses: actions/checkout@v3
46+
- uses: actions/checkout@v4
4547
with:
4648
persist-credentials: false
47-
- name: Use Node.js 14.x
48-
uses: actions/setup-node@v3
49+
- name: Use Node.js 20.x
50+
uses: actions/setup-node@v4
4951
with:
50-
node-version: '14.x'
52+
node-version: '20.x'
5153
- run: npm install
5254
- run: npm run semantic-release
5355
env:

.github/workflows/semver-check.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
steps:
1111
- name: Comment
1212
id: comment
13-
uses: adobe-rnd/github-semantic-release-comment-action@master
13+
uses: adobe-rnd/github-semantic-release-comment-action@main
1414
with:
15-
repo-token: ${{ secrets.GITHUB_TOKEN }}
15+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1616

CHANGELOG.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
1+
## [8.0.2](https://github.com/adobe/jsonschema2md/compare/v8.0.1...v8.0.2) (2024-04-09)
2+
3+
4+
### Bug Fixes
5+
6+
* remove helix-log dependency ([#579](https://github.com/adobe/jsonschema2md/issues/579)) ([9fbfdf9](https://github.com/adobe/jsonschema2md/commit/9fbfdf9726c512c4338c47bafef02347f1761372))
7+
8+
## [8.0.1](https://github.com/adobe/jsonschema2md/compare/v8.0.0...v8.0.1) (2024-03-25)
9+
10+
11+
### Bug Fixes
12+
13+
* **deps:** update external dependencies ([51be972](https://github.com/adobe/jsonschema2md/commit/51be972b9be85852e9a1ee2f9b7e5b7a86351375))
14+
15+
# [8.0.0](https://github.com/adobe/jsonschema2md/compare/v7.1.6...v8.0.0) (2024-03-25)
16+
17+
18+
### Build System
19+
20+
* require node 18 ([3b74f4f](https://github.com/adobe/jsonschema2md/commit/3b74f4f31fc16d28c9a4a8f317cdd1beb2242d7e))
21+
22+
23+
### BREAKING CHANGES
24+
25+
* requires node 18
26+
27+
## [7.1.6](https://github.com/adobe/jsonschema2md/compare/v7.1.5...v7.1.6) (2024-03-25)
28+
29+
30+
### Bug Fixes
31+
32+
* **deps:** update dependency @adobe/helix-log to v6.0.1 ([b54415a](https://github.com/adobe/jsonschema2md/commit/b54415a0ae4a66a8ec5da9d433403cf46b0cf351))
33+
* **deps:** update external fixes ([f515169](https://github.com/adobe/jsonschema2md/commit/f5151691a394c139f07ecaf8ec465e71dba49631))
34+
* **deps:** update external fixes ([e23d8f0](https://github.com/adobe/jsonschema2md/commit/e23d8f01666fedc12442fa2f9bab660c5aa58d8a))
35+
* **deps:** update external major ([#516](https://github.com/adobe/jsonschema2md/issues/516)) ([d7d72e6](https://github.com/adobe/jsonschema2md/commit/d7d72e61e2b65f0a790b8945d756082bf2fd3bcf))
36+
137
## [7.1.5](https://github.com/adobe/jsonschema2md/compare/v7.1.4...v7.1.5) (2022-12-12)
238

339

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# JSON Schema Markdown Tools
22

3-
[![CircleCI](https://circleci.com/gh/adobe/jsonschema2md.svg?style=svg)](https://circleci.com/gh/adobe/jsonschema2md)
3+
[![GitHub Actions](https://img.shields.io/github/actions/workflow/status/adobe/jsonschema2md/main.yaml)](https://github.com/adobe/jsonschema2md/actions/workflows/main.yaml)
44

55
Documenting and validating complex JSON Schemas can be hard. This tool makes it easier by providing a number of scripts that can turn JSON Schema files into readable Markdown documentation that is ready for consumption on GitHub or processed using Jekyll or other static site generators.
66

@@ -13,7 +13,7 @@ These tools have been introduced by Adobe to document Adobe's Experience Data Mo
1313
## Requirements
1414

1515
- `npm` version 3.10.8 or up
16-
- `node` v14 or up
16+
- `node` v18 or v20 or up
1717

1818
## Example Output
1919

@@ -45,10 +45,11 @@ Supported languages are:
4545
If you want to provide a translation of your own, [please use GitLocalize](https://gitlocalize.com/repo/3622)
4646

4747
## Display custom attributes in the property description
48-
`jsonschema2md` displays only the attributes of an property which are defined by the JSON Schema standard. If you want to display additional attributes in the property description you could provide a comma separated list with your custom attributes.
48+
`jsonschema2md` displays only the attributes of an property which are defined by the JSON Schema standard. If you want to display additional attributes in the property description you could provide these with the `--properties` (or `-p`) parameter.
4949

5050
```bash
51-
$ jsonschema2md -d examples/schemas -o examples/docs -p version,test
51+
# include both the `version` and the `test` attribute
52+
$ jsonschema2md -d examples/schemas -o examples/docs -p version -p test
5253
```
5354

5455
## Disable header template
@@ -109,8 +110,8 @@ This will run our Jasmine test suite as well as lint the JavaScript according to
109110

110111
### CI
111112

112-
Continuous integration runs on [CircleCI](https://circleci.com/gh/adobe/jsonschema2md).
113-
All pull requests automatically trigger a job that runs the [tests](#tests) by executing the [`config.yml`](.circleci/config.yml).
113+
Continuous integration runs on Github Actions.
114+
All pull requests automatically trigger a job that runs the [tests](#tests) by executing the [`main.yml`](.github/workflows/main.yaml).
114115

115116
### Code Coverage
116117

lib/index.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import yargs from 'yargs';
1414
import fs from 'fs-extra';
1515
import readdirp from 'readdirp';
16-
import { createDefaultLogger, SimpleInterface } from '@adobe/helix-log';
1716
import {
1817
iter, pipe, filter, map, obj,
1918
} from 'ferrum';
@@ -30,12 +29,7 @@ import writeSchema from './writeSchema.js';
3029
const __filename = fileURLToPath(import.meta.url);
3130
const __dirname = nodepath.dirname(__filename);
3231

33-
const logger = new SimpleInterface({
34-
logger: createDefaultLogger(),
35-
});
36-
const debug = logger.debug.bind(logger);
37-
const info = logger.info.bind(logger);
38-
const error = logger.error.bind(logger);
32+
const { debug, info, error } = console;
3933

4034
/**
4135
* @typedef {import("../types/api").JsonSchema} JsonSchema

0 commit comments

Comments
 (0)