Skip to content

Commit

Permalink
Merge branch 'main' into ODATA-1571
Browse files Browse the repository at this point in the history
  • Loading branch information
ralfhandl committed Oct 26, 2023
2 parents eeb658e + 01d02fa commit 81c444a
Show file tree
Hide file tree
Showing 59 changed files with 7,879 additions and 4,801 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pdf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:

strategy:
matrix:
node-version: [18.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v3
Expand Down
19 changes: 18 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,18 @@ Documents are generated from Markdown sources using Node.js modules described [h
3. Download and install [git](https://git-scm.com/), verify via `git -v`
4. Optionally download and install [GitHub Desktop](https://desktop.github.com/)
5. Clone this repository
6. In the local repository folder run `npm install`, verify via `npm test`
6. In the local repository folder run `npm install`, verify via `npm test`
Repeat this step if the test fails with an error message like the following after upgrading to a new Chrome version:
```
1 failing
1) OASIS doc build
Puppeteer:
Error: Could not find Chrome (ver. 116.0.5845.96). This can occur if either
1. you did not perform an installation before running the script (e.g. `npm install`) or
2. your cache path is incorrectly configured (which is: C:\Users\D024504\.cache\puppeteer).
For (2), check out our guide on configuring puppeteer at https://pptr.dev/guides/configuration.
```

### Document preparation

Expand All @@ -42,3 +53,9 @@ Documents are generated from Markdown sources using Node.js modules described [h

- `npm run pdf` converts the HTML files to PDF
- This is only necessary for publication to the [OASIS Library](https://www.oasis-open.org/standards/)

## Published documents

Title|Stage|Files|Published at
-----|-----|-----|------------
OData Extension for Data Aggregation Version 4.0|Committee Specification 03|[Specification](https://github.com/oasis-tcs/odata-specs/tree/odata-data-aggregation-ext/V4.0_CS03/docs/odata-data-aggregation-ext) [Vocabulary](https://github.com/oasis-tcs/odata-vocabularies/tree/odata-data-aggregation-ext/V4.0_CS03/vocabularies) [ABNF](https://github.com/oasis-tcs/odata-abnf/tree/odata-data-aggregation-ext/V4.0_CS03/abnf)|[OASIS](https://docs.oasis-open.org/odata/odata-data-aggregation-ext/v4.0/cs03/)
2,655 changes: 1,407 additions & 1,248 deletions docs/odata-csdl-json/odata-csdl-json.html

Large diffs are not rendered by default.

Loading

0 comments on commit 81c444a

Please sign in to comment.